remove -L/usr/lib in pcre-config,

standardize Makefile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1864 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/pcre/Makefile b/openwrt/package/pcre/Makefile
index 0172c28..918ef46 100644 (file)
--- a/openwrt/package/pcre/Makefile
+++ b/openwrt/package/pcre/Makefile
@@ -22,31 +22,31 @@ $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --program-prefix="" \
-               --program-suffix="" \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --datadir=/usr/share \
-               --includedir=/usr/include \
-               --infodir=/usr/share/info \
-               --libdir=/usr/lib \
-               --libexecdir=/usr/lib \
-               --localstatedir=/var \
-               --mandir=/usr/share/man \
-               --sbindir=/usr/sbin \
-               --sysconfdir=/etc \
-                 $(DISABLE_LARGEFILE) \
-                 $(DISABLE_NLS) \
-               --enable-shared \
-               --enable-static \
-               --enable-utf8 \
+                       --target=$(GNU_TARGET_NAME) \
+                       --host=$(GNU_TARGET_NAME) \
+                       --build=$(GNU_HOST_NAME) \
+                       --program-prefix="" \
+                       --program-suffix="" \
+                       --prefix=/usr \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \
+                       --enable-shared \
+                       --enable-static \
+                       --enable-utf8 \
        );
        touch $@
 
@@ -78,7 +78,7 @@ $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/
-       touch $(STAGING_DIR)/usr/lib/libpcre.so
+       touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libpcre.so
 

diff --git a/openwrt/package/pcre/patches/750-pcre_config_cross.patch b/openwrt/package/pcre/patches/750-pcre_config_cross.patch
new file mode 100644 (file)
index 0000000..c61a7f5
--- /dev/null
+++ b/openwrt/package/pcre/patches/750-pcre_config_cross.patch
@@ -0,0 +1,27 @@
+diff -ruN pcre-5.0-old/pcre-config.in pcre-5.0-new/pcre-config.in
+--- pcre-5.0-old/pcre-config.in        2004-09-13 16:20:00.000000000 +0200
++++ pcre-5.0-new/pcre-config.in        2005-09-04 16:34:39.000000000 +0200
+@@ -18,6 +18,10 @@
+   libR=" -R@libdir@"
+   ;;
+ esac
++libS=
++if test @libdir@ != /usr/lib ; then
++  libS=-L@libdir@
++fi
+ 
+ while test $# -gt 0; do
+   case "$1" in
+@@ -52,10 +56,10 @@
+       echo $includes
+       ;;
+     --libs-posix)
+-      echo -L@libdir@$libR -lpcreposix -lpcre
++      echo $libS$libR -lpcreposix -lpcre
+       ;;
+     --libs)
+-      echo -L@libdir@$libR -lpcre
++      echo $libS$libR -lpcre
+       ;;
+     *)
+       echo "${usage}" 1>&2