diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-30 00:54:19 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-30 00:54:19 +0100 |
| commit | 08c25989f570605e9c5b3084074138b66bb26eb2 (patch) | |
| tree | 8d5e5fd01afbd2dcfb3d79d943e651e0e6e91892 /mk/macros.packages.mk | |
| parent | da55dfd5123ad989e316c15ab11e71bc82ad4e40 (diff) | |
| download | embtoolkit-08c25989f570605e9c5b3084074138b66bb26eb2.tar.gz embtoolkit-08c25989f570605e9c5b3084074138b66bb26eb2.tar.bz2 embtoolkit-08c25989f570605e9c5b3084074138b66bb26eb2.tar.xz | |
Build system: make libtool hacks for cross compilation more portable by avoiding GNU extensions
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk/macros.packages.mk')
| -rw-r--r-- | mk/macros.packages.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 19d822d..e6e8ad6 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -85,8 +85,10 @@ __lt_path = $(addprefix $(embtk_sysroot)/usr/,$(or $(1),$(LIBDIR))) define __embtk_fix_libtool_files __lt_las=$$(find $(__lt_path) -name '*.la'); \ for la in $$__lt_las; do \ - sed -i "s;$(__ltlibdirold);$(__ltlibdirnew);" $$la; \ - sed -i "s;$(__lt_usr/lib);$(__lt_sysroot/usr/lib);g" $$la; \ + sed -e "s;$(__ltlibdirold);$(__ltlibdirnew);" \ + -e "s;$(__lt_usr/lib);$(__lt_sysroot/usr/lib);g" \ + < $$la > $$la.new; \ + mv $$la.new $$la; \ done endef libtool_files_adapt: @@ -109,12 +111,13 @@ endef #A macro to remove rpath in packages that use libtool -rpath define __embtk_kill_lt_rpath - cd $(strip $(1)); \ - LOCAL_LT_FILES=`find -type f -name libtool`; \ - for i in $$LOCAL_LT_FILES; \ - do \ - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $$i; \ - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $$i; \ + cd $(strip $(1)); \ + LOCAL_LT_FILES=`find . -type f -name libtool`; \ + for i in $$LOCAL_LT_FILES; do \ + sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + < $$i > $$i.new; \ + mv $$i.new $$i; \ done endef |