Do not do static linking

Last-Update: 2013-01-28

Last-Update: 2013-01-28
Gbp-Pq: Name 0003-do-not-do-static-linking.patch

diff --git a/Makefile b/Makefile
index efd349eb4966e37f7c873887fbec4ada34cd1332..2d2cdcab8565c14f3c39c78e4fe4dbac112f9ee1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1010,7 +1010,7 @@ ${UTILBDB}: ${UTILBDB_OBJS} ${BDBLIB_OBJS}
 # Link tests for external repos
 ${BUILD}/host/linktest/extern: ${HOSTLIB}
 ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
-${BUILD}/host/linktest/extern: LDLIBS += -static
+#${BUILD}/host/linktest/extern: LDLIBS += -static
 TEST_OBJS += ${BUILD}/host/linktest/extern.o
 
 .PHONY: hostlib
@@ -1102,7 +1102,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB}
 ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
 
 # Utilities for auto-update toolkits must be statically linked.
-${UTIL_BINS_STATIC}: LDFLAGS += -static
+${UTIL_BINS_STATIC}: # Not in Debian
 
 
 .PHONY: utils
@@ -1136,7 +1136,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
 ${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS}
 ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
        @${PRINTF} "    LD            $(subst ${BUILD}/,,$@)\n"
-       ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
+       ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
 
 ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20}
 ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB}