summaryrefslogtreecommitdiff
path: root/graphics/tclblt/patches/ldflags.patch
blob: f04a9a78f113f03e784807769a3deb7e8503fbac (plain)
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
53
54
Description: Patch adds support for externally set LDFLAGS. It lets
    passing hardening flags from debian/rules. Also, the rpath
    definition is removed.
Author: Sergei Golovan
Last-Modified: Fri, 04 Jul 2014 09:29:39 +0400

--- a/configure.in
+++ b/configure.in
@@ -1061,7 +1061,7 @@
 SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}"
 SHLIB_TCL_ONLY_LIB_SPECS="${TCL_ONLY_LIB_SPECS}"
 SHLIB_TCL_ONLY_LIB_SPECS=""
-LDFLAGS=""
+LDFLAGS="${LDFLAGS}"
 LD_RUN_PATH=""
 EXTRA_LIB_SPECS=""
 
@@ -1197,13 +1197,13 @@
     fi
     ;;
     
-  *-linux*)
+  *-linux*|*-gnu*)
     SHLIB_CFLAGS="-fPIC"
     SHLIB_LD="${CC}"
     SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
-    LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
+    LD_RUN_PATH=""
     
-    LDFLAGS=""
+    LDFLAGS="${LDFLAGS}"
     EXTRA_LIB_SPECS="-ldl"
     ;;
   
--- a/generic/shared/Makefile.in
+++ b/generic/shared/Makefile.in
@@ -144,7 +144,7 @@
 	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \
 		$(srcdir)/bltInit.c
 	$(RM) $@
-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
+	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
 		$(LIBS)
 
 # Line above changed for complete dependency listings - gordon
@@ -154,7 +154,7 @@
 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
 		$(srcdir)/bltInit.c
 	$(RM) $@
-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
+	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
 		$(TCL_ONLY_LIB_SPECS)
 
 # Line above changed for complete dependency listings - gordon