diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-13 09:25:16 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-13 09:25:16 +0000 |
| commit | 9527a34b36c8fa5185b10793c4fb44068eedfc2f (patch) | |
| tree | 9d3e7163e84f32e65d8e6b4a5d81e29091ee56f2 /databases/p5-Memcached-libmemcached | |
| parent | eb46820fc461312214848eef121d34bf4ad59d8f (diff) | |
Notes
Diffstat (limited to 'databases/p5-Memcached-libmemcached')
3 files changed, 10 insertions, 18 deletions
diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile index 05f3b93d6e48..b07ac07eaa8d 100644 --- a/databases/p5-Memcached-libmemcached/Makefile +++ b/databases/p5-Memcached-libmemcached/Makefile @@ -23,10 +23,4 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile.PL -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.PL -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL b/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL deleted file mode 100644 index c9685df3280b..000000000000 --- a/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.PL.orig 2015-05-07 17:56:22 UTC -+++ Makefile.PL -@@ -54,7 +54,7 @@ if (my $gccversion = $Config{gccversion} - $opts{DEFINE} .= ' -Wmissing-prototypes'; - } - } --$opts{LIBS} = ["-lstdc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 -+$opts{LIBS} = ["-lc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 - $opts{OPTIMIZE} = "-g" if $opt_g; - $opts{CCFLAGS} = "-pg" if $opt_pg; - my $coverage_flags = ""; diff --git a/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL b/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL index c00cc1dfcc13..a9e52265d80c 100644 --- a/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL +++ b/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL @@ -11,6 +11,15 @@ my $is_developer = (-d ".svn" || -d ".git"); my ($lmcd_h) = eval { build_libmemcached() }; +@@ -54,7 +54,7 @@ if (my $gccversion = $Config{gccversion} + $opts{DEFINE} .= ' -Wmissing-prototypes'; + } + } +-$opts{LIBS} = ["-lstdc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 ++$opts{LIBS} = ["-lc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 + $opts{OPTIMIZE} = "-g" if $opt_g; + $opts{CCFLAGS} = "-pg" if $opt_pg; + my $coverage_flags = ""; @@ -76,7 +76,7 @@ WriteMakefile( AUTHOR => 'Tim Bunce <Tim.Bunce@pobox.com>', VERSION_FROM => 'libmemcached.pm', |