diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-12-11 18:33:33 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-12-11 18:33:33 +0000 |
| commit | 8ea52679326834f1c4a65ea9a12a509e8ad1f20e (patch) | |
| tree | 5db6a66c280ae975964b8caccd3db1cc4a019977 | |
| parent | Update to version 2.10 (diff) | |
Fix the self-tests instead of just omitting them.
Notes
Notes:
svn path=/head/; revision=123734
| -rw-r--r-- | security/gpgme/Makefile | 11 | ||||
| -rw-r--r-- | security/gpgme/files/patch-tests-gpg-Makefile.in | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 2bb193f953d9..39b5f73f299e 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg \ gpgsm:${PORTSDIR}/security/gnupg-devel LIB_DEPENDS= gpg-error:${PORTSDIR}/security/libgpg-error \ - pth.20:${PORTSDIR}/devel/pth + pth:${PORTSDIR}/devel/pth USE_LIBTOOL_VER=15 USE_GMAKE= yes @@ -31,12 +31,15 @@ CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ INFO= gpgme +.include <bsd.port.pre.mk> post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} \ ${WRKSRC}/gpgme/Makefile.in \ ${WRKSRC}/gpgme/gpgme-config.in - @${REINPLACE_CMD} -e 's|@RUN_GPG_TESTS_TRUE@tests = tests|@RUN_GPG_TESTS_TRUE@tests =|g' \ - ${WRKSRC}/Makefile.in +.if ${OSVERSION} < 503100 || defined(PTHREAD_LIBS) && ${PTHREAD_LIBS} != "-pthread" + @${REINPLACE_CMD} -e 's|t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la|t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la -lpthread|g' \ + ${WRKSRC}/tests/gpg/Makefile.in +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/gpgme/files/patch-tests-gpg-Makefile.in b/security/gpgme/files/patch-tests-gpg-Makefile.in new file mode 100644 index 000000000000..e6a3c0593bab --- /dev/null +++ b/security/gpgme/files/patch-tests-gpg-Makefile.in @@ -0,0 +1,10 @@ +--- tests/gpg/Makefile.in.orig Sat Dec 11 18:25:43 2004 ++++ tests/gpg/Makefile.in Sat Dec 11 18:25:04 2004 +@@ -329,6 +329,7 @@ + AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ + LDADD = ../../gpgme/libgpgme.la + t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la ++t_thread1_LDFLAGS= $(PTH_LDFLAGS) + all: all-am + + .SUFFIXES: |