File wren-0.2.0-mk.patch of Package wren

Overview Repositories Revisions Requests Users Attributes Meta

File wren-0.2.0-mk.patch of Package wren

diff -Ndurp wren-0.2.0/util/wren.mk wren-0.2.0-mk/util/wren.mk
--- wren-0.2.0/util/wren.mk	2019-10-01 09:03:45.000000000 +0300
+++ wren-0.2.0-mk/util/wren.mk	2020-02-29 00:46:00.179134701 +0200
@@ -75,14 +75,12 @@ ifeq ($(ARCH),32)
 	C_OPTIONS += -m32
 	WREN := $(WREN)-32
 	BUILD_DIR := $(BUILD_DIR)-32
-	LIBUV_ARCH := -32
 endif
 
 ifeq ($(ARCH),64)
 	C_OPTIONS += -m64
 	WREN := $(WREN)-64
 	BUILD_DIR := $(BUILD_DIR)-64
-	LIBUV_ARCH := -64
 endif
 
 # Some platform-specific workarounds. Note that we use "gcc" explicitly in the
@@ -113,12 +111,7 @@ else
 	SHARED_LIB_FLAGS := -Wl,-soname,libwren.so
 	SHARED_EXT := so
 
-	# Link in the right libraries needed by libuv on Windows and Linux.
-	ifeq ($(OS),mingw32)
-		LIBUV_LIBS := -lws2_32 -liphlpapi -lpsapi -luserenv
-	else
-		LIBUV_LIBS := -lpthread -lrt
-	endif
+	LIBUV_LIBS := $(shell pkg-config --libs libuv)
 endif
 
 CFLAGS := $(C_OPTIONS) $(C_WARNINGS)
@@ -130,12 +123,9 @@ VM_OBJECTS        := $(addprefix $(BUILD
 API_TEST_OBJECTS  := $(patsubst test/api/%.c, $(BUILD_DIR)/test/api/%.o, $(API_TEST_SOURCES))
 UNIT_TEST_OBJECTS := $(patsubst test/unit/%.c, $(BUILD_DIR)/test/unit/%.o, $(UNIT_TEST_SOURCES))
 
-LIBUV_DIR := deps/libuv
-LIBUV     := build/libuv$(LIBUV_ARCH).a
-
 # Flags needed to compile source files for the CLI, including the modules and
 # API tests.
-CLI_FLAGS := -D_XOPEN_SOURCE=600 -Isrc/include -I$(LIBUV_DIR)/include \
+CLI_FLAGS := -D_XOPEN_SOURCE=600 -Isrc/include $(shell pkg-config --cflags libuv) \
              -Isrc/cli -Isrc/module
 
 # Targets ---------------------------------------------------------------------
@@ -162,11 +152,10 @@ api_test: $(BUILD_DIR)/test/api_$(WREN)
 unit_test: $(BUILD_DIR)/test/unit_$(WREN)
 
 # Command-line interpreter.
-bin/$(WREN): $(OPT_OBJECTS) $(CLI_OBJECTS) $(MODULE_OBJECTS) $(VM_OBJECTS) \
-		$(LIBUV)
-	@ printf "%10s %-30s %s\n" $(CC) $@ "$(C_OPTIONS)"
+bin/$(WREN): $(OPT_OBJECTS) $(CLI_OBJECTS) $(MODULE_OBJECTS) $(VM_OBJECTS)
+	@ printf "%10s %-30s %s\n" $(CC) $@ "$(LDFLAGS) -lm $(LIBUV_LIBS)"
 	$(V) mkdir -p bin
-	$(V) $(CC) $(CFLAGS) $^ -o $@ -lm $(LIBUV_LIBS)
+	$(V) $(CC) $(LDFLAGS) $^ -o $@ -lm $(LIBUV_LIBS)
 
 # Static library.
 lib/lib$(WREN).a: $(OPT_OBJECTS) $(VM_OBJECTS)
@@ -176,9 +165,9 @@ lib/lib$(WREN).a: $(OPT_OBJECTS) $(VM_OB
 
 # Shared library.
 lib/lib$(WREN).$(SHARED_EXT): $(OPT_OBJECTS) $(VM_OBJECTS)
-	@ printf "%10s %-30s %s\n" $(CC) $@ "$(C_OPTIONS) $(SHARED_LIB_FLAGS)"
+	@ printf "%10s %-30s %s\n" $(CC) $@ "$(LDFLAGS) $(SHARED_LIB_FLAGS)"
 	$(V) mkdir -p lib
-	$(V) $(CC) $(CFLAGS) -shared $(SHARED_LIB_FLAGS) -o $@ $^
+	$(V) $(CC) $(LDFLAGS) -shared $(SHARED_LIB_FLAGS) -o $@ $^ -lm
 
 # API test executable.
 $(BUILD_DIR)/test/api_$(WREN): $(OPT_OBJECTS) $(MODULE_OBJECTS) $(API_TEST_OBJECTS) \
@@ -191,21 +180,21 @@ $(BUILD_DIR)/test/api_$(WREN): $(OPT_OBJ
 # Unit test executable.
 $(BUILD_DIR)/test/unit_$(WREN): $(OPT_OBJECTS) $(MODULE_OBJECTS) $(UNIT_TEST_OBJECTS) \
 		$(VM_OBJECTS) $(BUILD_DIR)/cli/modules.o $(BUILD_DIR)/cli/vm.o \
-		$(BUILD_DIR)/cli/path.o $(LIBUV)
-	@ printf "%10s %-30s %s\n" $(CC) $@ "$(C_OPTIONS)"
+		$(BUILD_DIR)/cli/path.o
+	@ printf "%10s %-30s %s\n" $(CC) $@ "$(LDFLAGS) -lm $(LIBUV_LIBS)"
 	$(V) mkdir -p $(BUILD_DIR)/test/unit
-	$(V) $(CC) $(CFLAGS) $^ -o $@
+	$(V) $(CC) $(LDFLAGS) $^ -o $@
 
 # CLI object files.
 $(BUILD_DIR)/cli/%.o: src/cli/%.c $(CLI_HEADERS) $(MODULE_HEADERS) \
-		$(VM_HEADERS) $(LIBUV)
+		$(VM_HEADERS)
 	@ printf "%10s %-30s %s\n" $(CC) $< "$(C_OPTIONS)"
 	$(V) mkdir -p $(BUILD_DIR)/cli
 	$(V) $(CC) -c $(CFLAGS) $(CLI_FLAGS) -o $@ $(FILE_FLAG) $<
 
 # Module object files.
 $(BUILD_DIR)/module/%.o: src/module/%.c $(CLI_HEADERS) $(MODULE_HEADERS) \
-		$(VM_HEADERS) $(LIBUV)
+		$(VM_HEADERS)
 	@ printf "%10s %-30s %s\n" $(CC) $< "$(C_OPTIONS)"
 	$(V) mkdir -p $(BUILD_DIR)/module
 	$(V) $(CC) -c $(CFLAGS) $(CLI_FLAGS) -o $@ $(FILE_FLAG) $<
@@ -231,7 +220,7 @@ $(BUILD_DIR)/test/api/%.o: test/api/%.c
 
 # Unit test object files.
 $(BUILD_DIR)/test/unit/%.o: test/unit/%.c $(OPT_HEADERS) $(MODULE_HEADERS) \
-		 $(VM_HEADERS) $(UNIT_TEST_HEADERS) $(LIBUV)
+		 $(VM_HEADERS) $(UNIT_TEST_HEADERS)
 	@ printf "%10s %-30s %s\n" $(CC) $< "$(C_OPTIONS)"
 	$(V) mkdir -p $(dir $@)
 	$(V) $(CC) -c $(CFLAGS) $(CLI_FLAGS) -o $@ $(FILE_FLAG) $<

Places

File wren-0.2.0-mk.patch of Package wren

Places