summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam>2001-04-30 03:31:26 +0000
committerjlam <jlam>2001-04-30 03:31:26 +0000
commita82ca665d3470213835c146991fbf7ca87d36637 (patch)
treea4f40737126576e52413a43a1608fa58e0d9f01c /www
parent5d3bfd761647721187d938bf30968fdf91248115 (diff)
downloadpkgsrc-a82ca665d3470213835c146991fbf7ca87d36637.tar.gz
Rethink how to link in c-client library so that we don't depend upon
libtool internals when linking the objects in libc-client_pic.a into imap.so.
Diffstat (limited to 'www')
-rw-r--r--www/php4-imap/Makefile31
1 files changed, 7 insertions, 24 deletions
diff --git a/www/php4-imap/Makefile b/www/php4-imap/Makefile
index 2ac4725fe5c..a28ba61c5b1 100644
--- a/www/php4-imap/Makefile
+++ b/www/php4-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/04/30 03:31:26 jlam Exp $
.include "../../www/php4/Makefile.module"
@@ -17,28 +17,11 @@ CONFIGURE_ARGS+= --with-${MODNAME}-ssl=shared,${SSLBASE}
USE_SSL= # defined
-MAKE_ENV+= LTLIBRARY_OBJECTS_X="${CCLIENT_PIC_LOBJS}"
-
-pre-build:
- ${MKDIR} ${WRKSRC}/ext/imap/.libs; \
- cd ${WRKSRC}/ext/imap/.libs; \
- ${AR} x ${CCLIENT_PIC_LIB}
- cd ${WRKSRC}/ext/imap; \
- for file in ${CCLIENT_PIC_OBJS}; do \
- base=`basename $${file} .o`; \
- ${RM} -f $${base}.lo; \
- ( ${ECHO} "#"; \
- ${ECHO} "# Generated by libtool"; \
- ${ECHO} "#"; \
- ${ECHO} "pic_object=.libs/$${file}"; \
- ${ECHO} "non_pic_object=.libs/$${file}"; \
- ) > $${base}.lo; \
- ${LN} -sf $${base}.lo $${base}.slo; \
- done
+MAKE_ENV+= LTLIBRARY_LDFLAGS="${LTLIBRARY_LDFLAGS}"
-.include "../../mk/bsd.pkg.mk"
-
-.if exists(${CCLIENT_PIC_LIB}) && !defined(CCLIENT_PIC_OBJS)
-CCLIENT_PIC_OBJS!= ${AR} t ${CCLIENT_PIC_LIB}
-CCLIENT_PIC_LOBJS= ${CCLIENT_PIC_OBJS:S/.o/.lo/g}
+.if !defined(LTLIBRARY_LDFLAGS)
+LTLIBRARY_LDFLAGS= -Wl,--whole-archive -Wl,${CCLIENT_PIC_LIB}
+LTLIBRARY_LDFLAGS+= -Wl,-R${SSLBASE}/lib -L${SSLBASE}/lib -lcrypto -lssl
.endif
+
+.include "../../mk/bsd.pkg.mk"