cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Different workaround for link path ordering, keep build path out of

Browse Source 
pkgconfig entry.  Problem reported by and ok landry@.
This commit is contained in:
naddy 2008-06-09 21:00:57 +00:00
parent 713f16639e
commit 2356cf20d6
5 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/curl/Makefile
View File

@ -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

12
net/curl/patches/patch-docs_examples_Makefile_in Normal file
View File

@ -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 \

12
net/curl/patches/patch-src_Makefile_in Normal file
View File

@ -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

12
net/curl/patches/patch-tests_libtest_Makefile_in Normal file
View File

@ -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) \

12
net/curl/patches/patch-tests_server_Makefile_in Normal file
View File

@ -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) \