summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-19 08:42:07 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-19 08:42:07 +0000
commitb7b95d86dfe7b12b0c768a36d922a4be9111d576 (patch)
treea94eaed5cd483fd490bd1bbc256862f8d3127ade /sys-libs/zlib/files
parentupdate copyright (diff)
downloadgentoo-2-b7b95d86dfe7b12b0c768a36d922a4be9111d576.tar.gz
gentoo-2-b7b95d86dfe7b12b0c768a36d922a4be9111d576.tar.bz2
gentoo-2-b7b95d86dfe7b12b0c768a36d922a4be9111d576.zip
Fixes by Diego Pettenò to respect user LDFLAGS and not run ldconfig #126718.
(Portage version: 2.1_pre6-r3)
Diffstat (limited to 'sys-libs/zlib/files')
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch b/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch
new file mode 100644
index 000000000000..86da956eb5f4
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch
@@ -0,0 +1,31 @@
+--- zlib-1.2.3/Makefile.in
++++ zlib-1.2.3/Makefile.in
+@@ -24,7 +24,7 @@
+ #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+ # -Wstrict-prototypes -Wmissing-prototypes
+
+-LDFLAGS=libz.a
++TEST_LDFLAGS=libz.a
+ LDSHARED=$(CC)
+ CPP=$(CC) -E
+
+@@ -83,16 +83,16 @@
+ $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@
+
+ $(SHAREDLIBV): $(PIC_OBJS)
+- $(LDSHARED) -o $@ $(PIC_OBJS) -lc
++ $(LDSHARED) -o $@ $(PIC_OBJS) -lc $(LDFLAGS)
+ rm -f $(SHAREDLIB) $(SHAREDLIBM)
+ ln -s $@ $(SHAREDLIB)
+ ln -s $@ $(SHAREDLIBM)
+
+ example$(EXE): example.o $(LIBS)
+- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) $(TEST_LDFLAGS)
+
+ minigzip$(EXE): minigzip.o $(LIBS)
+- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) $(TEST_LDFLAGS)
+
+ install-libs: $(LIBS)
+ -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi