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 f254536f397b497348b45e970ba8380e66b4e3ba..51a41f24465ddd6fe1fb94537d01efb583636842 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1016,7 +1016,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
@@ -1108,7 +1108,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
@@ -1141,7 +1141,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
 
 ${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}
 ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB}