summaryrefslogtreecommitdiff
path: root/package/gettext
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-10 10:59:12 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-10 10:59:12 +0100
commita217fc80b29080dae963bb15051df023de36ce39 (patch)
treee69fc812c517d767ca1a24a60cc2b9c8ce1bb3c0 /package/gettext
parent7709c0e4f3a9ea4fddbe5764c000135f9eacac49 (diff)
add LTO support to toolchain settings. Cleanup SYSROOT mess.
- just use on sysroot directory for toolchain. - add missing patches from previos commit. (rpath/cflags cleanup)
Diffstat (limited to 'package/gettext')
-rw-r--r--package/gettext/Makefile3
-rw-r--r--package/gettext/patches/patch-build-aux_ltmain_sh30
2 files changed, 32 insertions, 1 deletions
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 76e73fed0..76d47acd5 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -18,7 +18,7 @@ ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
endif
-WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime
+WRKSRC= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime
include ${TOPDIR}/mk/package.mk
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+= --disable-java \
--disable-csharp \
--enable-nls \
--disable-libasprintf \
+ --disable-rpath \
--enable-threads=posix \
--disable-openmp \
--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \
diff --git a/package/gettext/patches/patch-build-aux_ltmain_sh b/package/gettext/patches/patch-build-aux_ltmain_sh
new file mode 100644
index 000000000..9141bd704
--- /dev/null
+++ b/package/gettext/patches/patch-build-aux_ltmain_sh
@@ -0,0 +1,30 @@
+--- gettext-0.18.1.1.orig/build-aux/ltmain.sh 2010-06-06 14:49:57.000000000 +0200
++++ gettext-0.18.1.1/build-aux/ltmain.sh 2011-01-08 23:49:55.000000000 +0100
+@@ -5652,27 +5652,6 @@ func_mode_link ()
+ esac
+ fi
+
+- # Hardcode the library path.
+- # Skip directories that are in the system default run-time
+- # search path.
+- case " $sys_lib_dlsearch_path " in
+- *" $absdir "*) ;;
+- *)
+- case "$compile_rpath " in
+- *" $absdir "*) ;;
+- *) compile_rpath="$compile_rpath $absdir"
+- esac
+- ;;
+- esac
+- case " $sys_lib_dlsearch_path " in
+- *" $libdir "*) ;;
+- *)
+- case "$finalize_rpath " in
+- *" $libdir "*) ;;
+- *) finalize_rpath="$finalize_rpath $libdir"
+- esac
+- ;;
+- esac
+ fi # $linkmode,$pass = prog,link...
+
+ if test "$alldeplibs" = yes &&