1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
Author: Andreas Beckmann <anbe@debian.org>
Description: link libraries after object files
to allow proper dependency resolution
drop now superfluous --no-as-needed flag
fail on unresolved symbols
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@ ifndef GTK2_CFLAGS
endif
ifndef GTK2_LDFLAGS
- GTK2_LDFLAGS := -Wl,--no-as-needed $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+ GTK2_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
endif
ifndef GTK3_AVAILABLE
@@ -55,7 +55,7 @@ ifeq (1,$(GTK3_AVAILABLE))
endif
ifndef GTK3_LDFLAGS
- GTK3_LDFLAGS := -Wl,--no-as-needed $(shell $(PKG_CONFIG) --libs gtk+-3.0)
+ GTK3_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-3.0)
endif
else
GTK3_CFLAGS ?=
@@ -280,19 +280,19 @@ $(NVIDIA_SETTINGS).unstripped: $(OBJS) $
$(eval $(call DEBUG_INFO_RULES, $(GTK2LIB)))
$(GTK2LIB).unstripped: $(LIBXNVCTRL) $(GTK2_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- $(LIBXNVCTRL) $(LIBS) $(GTK2_LIBS) \
- -Wl,--unresolved-symbols=ignore-all -o $@ \
+ -o $@ \
-Wl,-soname -Wl,$(GTK2LIB_SONAME) \
- $(GTK2_OBJS) $(IMAGE_OBJS) $(XCP_OBJS)
+ $(GTK2_OBJS) $(IMAGE_OBJS) $(XCP_OBJS) \
+ $(LIBXNVCTRL) $(LIBS) $(GTK2_LIBS)
ifdef BUILD_GTK3LIB
$(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS) \
- -Wl,--unresolved-symbols=ignore-all -o $@ \
+ -o $@ \
-Wl,-soname -Wl,$(GTK3LIB_SONAME) \
- $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS)
+ $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) \
+ $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS)
endif
# define the rule to build each object file
|
