On Thu, Aug 15 2019, Peter Hessler <[email protected]> wrote:
> libstdc++ doesn't exist on platforms without gcc, so remove the
> hard-coded dependancy.
>
> Fixes build on aarch64.
>
> OK?
I wonder why this workaround was added in the first place (probably for
clang on Linux, using libstdc++?)
ok jca@
> Index: security/gpgme/Makefile
> ===================================================================
> RCS file: /cvs/openbsd/ports/security/gpgme/Makefile,v
> retrieving revision 1.55
> diff -u -p -u -p -r1.55 Makefile
> --- security/gpgme/Makefile 2 Aug 2019 15:12:07 -0000 1.55
> +++ security/gpgme/Makefile 15 Aug 2019 05:50:38 -0000
> @@ -7,6 +7,7 @@ VERSION = 1.13.1
> DISTNAME = gpgme-${VERSION}
> PKGNAME-main = gpgme-${VERSION}
> PKGNAME-qt = gpgme-qt-${VERSION}
> +REVISION = 0
>
> CATEGORIES = security devel
>
> Index: security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
> ===================================================================
> RCS file: security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
> diff -N security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ security/gpgme/patches/patch-lang_cpp_tests_Makefile_in 15 Aug 2019
> 05:50:23 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +do not hard-code libstdc++, it may not exist on all platforms
> +
> +Index: lang/cpp/tests/Makefile.in
> +--- lang/cpp/tests/Makefile.in.orig
> ++++ lang/cpp/tests/Makefile.in
> +@@ -414,7 +414,7 @@ top_srcdir = @top_srcdir@
> + AM_LDFLAGS = -no-install
> + LDADD = ../../cpp/src/libgpgmepp.la \
> + ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
> +- @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
> ++ @LDADD_FOR_TESTS_KLUDGE@
> +
> + AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
> + @GPG_ERROR_CFLAGS@ @GPG_ERROR_CFLAGS@ \
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
