summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-08-05 09:04:59 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-08-05 09:04:59 +0200
commit56df778d52d6aa41c812fba42ff1af07e4d1288f (patch)
tree515df6da350d7b7101a637065b789bda9c717618
parent4b4200ec896e555cf23ee0dd72f79721e54addcf (diff)
fix cross-compile under Darwin, better style
-rw-r--r--package/pcrepp/Makefile8
-rw-r--r--package/pcrepp/patches/patch-Makefile_in6
-rw-r--r--package/pcrepp/patches/patch-configure20
3 files changed, 27 insertions, 7 deletions
diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile
index 639f5ad53..ae848d3d6 100644
--- a/package/pcrepp/Makefile
+++ b/package/pcrepp/Makefile
@@ -19,15 +19,15 @@ PKG_CXX:= pcrepp
PKG_CFLINE_PCREPP:= depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC
DISTFILES:= pcre++-${PKG_VERSION}.tar.gz
+WRKDIST= ${WRKDIR}/pcre++-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,PCREPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-extract:
- mv ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}/pcre++-${PKG_VERSION} ${WRKBUILD}
-
post-install:
- ${CP} ${WRKINST}/* ${WRKINST}/../pkg-${PKG_NAME}
+ $(INSTALL_DIR) $(IDIR_PCREPP)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libpcre++.so* \
+ $(IDIR_PCREPP)/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pcrepp/patches/patch-Makefile_in b/package/pcrepp/patches/patch-Makefile_in
index c10eab68d..d64d1e99a 100644
--- a/package/pcrepp/patches/patch-Makefile_in
+++ b/package/pcrepp/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
---- pcrepp-0.9.5.orig/Makefile.in 2011-05-13 10:25:39.126696935 +0200
-+++ pcrepp-0.9.5/Makefile.in 2011-05-13 10:18:08.619616044 +0200
-@@ -77,7 +77,7 @@
+--- pcre++-0.9.5.orig/Makefile.in 2004-08-25 01:38:03.000000000 +0200
++++ pcre++-0.9.5/Makefile.in 2011-08-05 07:28:46.000000000 +0200
+@@ -77,7 +77,7 @@ RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
diff --git a/package/pcrepp/patches/patch-configure b/package/pcrepp/patches/patch-configure
new file mode 100644
index 000000000..0ee82218e
--- /dev/null
+++ b/package/pcrepp/patches/patch-configure
@@ -0,0 +1,20 @@
+--- pcre++-0.9.5.orig/configure 2004-08-25 01:38:03.000000000 +0200
++++ pcre++-0.9.5/configure 2011-08-05 07:30:53.000000000 +0200
+@@ -8612,7 +8612,7 @@ if test "x$with_pcre_include" = "x"; the
+ CPPFLAGS="$CPPFLAGS -I/include"
+ ;;
+ *-*-linux*)
+- CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I/usr/include -I/usr/local/include"
++ CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
+ ;;
+ *-*-freebsd*)
+ CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I/usr/local/include"
+@@ -8621,7 +8621,7 @@ if test "x$with_pcre_include" = "x"; the
+ CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I$prefix/include -I/usr/local/include"
+ ;;
+ *)
+- CPPFLAGS="-I/usr/include -I/usr/local/include"
++ CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
+ ;;
+ esac
+ fi