From 2356cf20d6b473312b029802be1f0e803bc10ac0 Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 9 Jun 2008 21:00:57 +0000 Subject: [PATCH] Different workaround for link path ordering, keep build path out of pkgconfig entry. Problem reported by and ok landry@. --- net/curl/Makefile | 5 ++--- net/curl/patches/patch-docs_examples_Makefile_in | 12 ++++++++++++ net/curl/patches/patch-src_Makefile_in | 12 ++++++++++++ net/curl/patches/patch-tests_libtest_Makefile_in | 12 ++++++++++++ net/curl/patches/patch-tests_server_Makefile_in | 12 ++++++++++++ 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 net/curl/patches/patch-docs_examples_Makefile_in create mode 100644 net/curl/patches/patch-src_Makefile_in create mode 100644 net/curl/patches/patch-tests_libtest_Makefile_in create mode 100644 net/curl/patches/patch-tests_server_Makefile_in diff --git a/net/curl/Makefile b/net/curl/Makefile index 954e2248fae..8d329f530da 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.60 2008/05/13 17:56:29 naddy Exp $ +# $OpenBSD: Makefile,v 1.61 2008/06/09 21:00:57 naddy Exp $ COMMENT= get files from FTP, Gopher, HTTP or HTTPS servers DISTNAME= curl-7.18.1 +PKGNAME= ${DISTNAME}p0 SHARED_LIBS += curl 9.0 # .4.1 CATEGORIES= net MASTER_SITES= http://curl.haxx.se/download/ \ @@ -35,8 +36,6 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --with-random="/dev/arandom" \ --with-libidn=${LOCALBASE} \ --without-libssh2 -# don't link against ${LOCALBASE}/lib/libcurl -CONFIGURE_ENV= LDFLAGS="-L${WRKBUILD}/lib/.libs" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp diff --git a/net/curl/patches/patch-docs_examples_Makefile_in b/net/curl/patches/patch-docs_examples_Makefile_in new file mode 100644 index 00000000000..ff350da6b15 --- /dev/null +++ b/net/curl/patches/patch-docs_examples_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-docs_examples_Makefile_in,v 1.1 2008/06/09 21:00:57 naddy Exp $ +--- docs/examples/Makefile.in.orig Mon Jun 9 11:04:37 2008 ++++ docs/examples/Makefile.in Mon Jun 9 11:05:09 2008 +@@ -174,7 +174,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ -L../../lib/.libs $(LDFLAGS) -o $@ + SOURCES = 10-at-a-time.c anyauthput.c cookie_interface.c debug.c \ + fileupload.c fopen.c ftpget.c ftpgetresp.c ftpupload.c \ + getinfo.c getinmemory.c http-post.c httpput.c https.c \ diff --git a/net/curl/patches/patch-src_Makefile_in b/net/curl/patches/patch-src_Makefile_in new file mode 100644 index 00000000000..15b3e4b231e --- /dev/null +++ b/net/curl/patches/patch-src_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_Makefile_in,v 1.1 2008/06/09 21:00:57 naddy Exp $ +--- src/Makefile.in.orig Mon Jun 9 10:44:30 2008 ++++ src/Makefile.in Mon Jun 9 10:45:09 2008 +@@ -67,7 +67,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ -L../lib/.libs $(LDFLAGS) -o $@ + SOURCES = $(curl_SOURCES) + DIST_SOURCES = $(curl_SOURCES) + ETAGS = etags diff --git a/net/curl/patches/patch-tests_libtest_Makefile_in b/net/curl/patches/patch-tests_libtest_Makefile_in new file mode 100644 index 00000000000..eb39c22e010 --- /dev/null +++ b/net/curl/patches/patch-tests_libtest_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-tests_libtest_Makefile_in,v 1.1 2008/06/09 21:00:57 naddy Exp $ +--- tests/libtest/Makefile.in.orig Mon Jun 9 11:16:08 2008 ++++ tests/libtest/Makefile.in Mon Jun 9 11:16:28 2008 +@@ -282,7 +282,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ -L../../lib/.libs $(LDFLAGS) -o $@ + SOURCES = $(lib500_SOURCES) $(lib501_SOURCES) $(lib502_SOURCES) \ + $(lib503_SOURCES) $(lib504_SOURCES) $(lib505_SOURCES) \ + $(lib506_SOURCES) $(lib507_SOURCES) $(lib508_SOURCES) \ diff --git a/net/curl/patches/patch-tests_server_Makefile_in b/net/curl/patches/patch-tests_server_Makefile_in new file mode 100644 index 00000000000..87e0484318c --- /dev/null +++ b/net/curl/patches/patch-tests_server_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-tests_server_Makefile_in,v 1.1 2008/06/09 21:00:57 naddy Exp $ +--- tests/server/Makefile.in.orig Mon Jun 9 11:15:06 2008 ++++ tests/server/Makefile.in Mon Jun 9 11:15:36 2008 +@@ -98,7 +98,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ -L../../lib/.libs $(LDFLAGS) -o $@ + SOURCES = $(getpart_SOURCES) $(resolve_SOURCES) $(sockfilt_SOURCES) \ + $(sws_SOURCES) $(tftpd_SOURCES) + DIST_SOURCES = $(getpart_SOURCES) $(resolve_SOURCES) \