Revision: 25896
http://sourceforge.net/p/gar/code/25896
Author: dmichelsen
Date: 2016-08-21 13:15:56 +0000 (Sun, 21 Aug 2016)
Log Message:
-----------
libpsl/trunk: Make sure the correct ICU is used
Modified Paths:
--------------
csw/mgar/pkg/libpsl/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch
Modified: csw/mgar/pkg/libpsl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpsl/trunk/Makefile 2016-08-21 12:10:08 UTC (rev 25895)
+++ csw/mgar/pkg/libpsl/trunk/Makefile 2016-08-21 13:15:56 UTC (rev 25896)
@@ -10,9 +10,15 @@
MASTER_SITES +=
https://github.com/rockdaboot/libpsl/releases/download/$(DISTNAME)/
DISTFILES += $(DISTNAME).tar.gz
+# Use patch until this is fixed:
+# https://github.com/rockdaboot/libpsl/pull/54
+PATCHFILES += 0001-Use-proper-library-path-and-libs-for-ICU.patch
+
PACKAGES += CSWlibpsl5
SPKG_DESC_CSWlibpsl5 = Public Suffix List library, libpsl.so.5
# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibicuuc57
+RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibicudata57
RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWpublic-suffix-list
CHECKPKG_OVERRIDES_CSWlibpsl5 += surplus-dependency|CSWpublic-suffix-list
@@ -21,6 +27,7 @@
PKGFILES_CSWlibpsl-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWlibpsl-dev += $(bindir)/.*
RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibicuuc57
+RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibicudata57
RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibpsl5
BUILD64_LIBS_ONLY = 1
@@ -35,3 +42,7 @@
BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
include gar/category.mk
+
+post-patch:
+ cd $(WORKSRC) && autoreconf -fi
+ @$(MAKECOOKIE)
Added:
csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch
===================================================================
---
csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch
(rev 0)
+++
csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch
2016-08-21 13:15:56 UTC (rev 25896)
@@ -0,0 +1,34 @@
+From 9527a804deaf2bf4644779793ccb9ea9aa68a881 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Sun, 21 Aug 2016 15:02:39 +0200
+Subject: [PATCH] Use proper library path and libs for ICU
+
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 71a1d01..c0f0b3e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,7 +11,7 @@ libpsl_la_CPPFLAGS = -I$(top_srcdir)/include
+ # include ABI version information
+ libpsl_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION)
+ if WITH_LIBICU
+- libpsl_la_LDFLAGS += -licuuc
++ libpsl_la_LDFLAGS += $(LIBICU_LIBS)
+ endif
+ if WITH_LIBIDN2
+ libpsl_la_LDFLAGS += -lidn2 -lunistring
+@@ -24,7 +24,7 @@ noinst_PROGRAMS = psl2c
+ psl2c_SOURCES = psl2c.c lookup_string_in_fixed_set.c
+ psl2c_CPPFLAGS = -I$(top_srcdir)/include
-DMAKE_DAFSA=\"$(top_srcdir)/src/psl-make-dafsa\"
+ if BUILTIN_GENERATOR_LIBICU
+- psl2c_LDADD = -licuuc
++ psl2c_LDADD = $(LIBICU_LIBS)
+ endif
+ if BUILTIN_GENERATOR_LIBIDN2
+ psl2c_LDADD = @LTLIBICONV@ -lidn2 -lunistring
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
