SF.net SVN: gar:[26784] csw/mgar/pkg/libserf/trunk

[dmichelsen at users.sourceforge.net]

Revision: 26784
          http://sourceforge.net/p/gar/code/26784
Author:   dmichelsen
Date:     2021-09-13 09:14:46 +0000 (Mon, 13 Sep 2021)
Log Message:
-----------
libserf/trunk: Fix runpath issue on libapr

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libserf/trunk/files/
    csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch
    csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2021-09-09 10:19:04 UTC (rev 26783)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2021-09-13 09:14:46 UTC (rev 26784)
@@ -12,10 +12,12 @@
     operation.
 endef
 
-MASTER_SITES = http://mirror.serversupportforum.de/apache/serf/
+MASTER_SITES += https://www.apache.org/dist/serf/
 DISTFILES += $(DISTNAME).tar.bz2
-#PATCHFILES  += 0001-mark-solaris-as-posix-for-scons.patch
 
+PATCHFILES += 0001-Always-use-SHLIBVERSION.patch
+PATCHFILES += 0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch
+
 LICENSE = LICENSE
 VENDOR_URL = https://serf.apache.org/
 
@@ -53,8 +55,6 @@
 
 BUILD64 = 1
 
-EXTRA_LIB = $(prefix)/bdb48/lib
-
 SCONS_FLAGS += APR=$(bindir)/apr-1-config
 SCONS_FLAGS += APU=$(bindir)/apu-1-config
 

Added: csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch
===================================================================
--- csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch	                        (rev 0)
+++ csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch	2021-09-13 09:14:46 UTC (rev 26784)
@@ -0,0 +1,26 @@
+From 72cb92a806348a736ac2fcfefec125399ae49832 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 17 Nov 2016 13:02:31 +0100
+Subject: [PATCH] Always use SHLIBVERSION
+
+---
+ SConstruct | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 4358a23..9f32566 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -215,8 +215,7 @@ incdir = '$PREFIX/include/serf-$MAJOR'
+ # Unfortunately we can't set the .dylib compatibility_version option separately
+ # from current_version, so don't use the PATCH level to avoid that build and
+ # runtime patch levels have to be identical.
+-if sys.platform != 'sunos5':
+-  env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
++env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
+ 
+ LIBNAME = 'libserf-%d' % (MAJOR,)
+ if sys.platform != 'win32':
+-- 
+2.4.0
+

Added: csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch
===================================================================
--- csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch	                        (rev 0)
+++ csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch	2021-09-13 09:14:46 UTC (rev 26784)
@@ -0,0 +1,28 @@
+From 841845c81df6dd65f759e9b131681c60c0b6ce6f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 13 Sep 2021 11:09:06 +0200
+Subject: [PATCH] Do not include libdir to runpath as this is done through
+ LDFLAGS
+
+---
+ SConstruct | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 9f32566..df9e273 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -223,8 +223,8 @@ if sys.platform != 'win32':
+ else:
+   LIBNAMESTATIC = 'serf-${MAJOR}'
+ 
+-env.Append(RPATH=libdir,
+-           PDB='${TARGET.filebase}.pdb')
++#env.Append(RPATH=libdir,
++#           PDB='${TARGET.filebase}.pdb')
+ 
+ if sys.platform == 'darwin':
+ #  linkflags.append('-Wl,-install_name, at executable_path/%s.dylib' % (LIBNAME,))
+-- 
+2.4.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.