diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-29 21:49:29 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-29 21:49:29 +0100 |
| commit | 8efa332fa609eea0cfe124b827098aff6d2fc9a0 (patch) | |
| tree | 3978492a618c8974809f111d84c4831c2b692b32 | |
| parent | f883f619429064fb4f3d05bd2cb6b0694efe2fae (diff) | |
| download | embtoolkit-8efa332fa609eea0cfe124b827098aff6d2fc9a0.tar.gz embtoolkit-8efa332fa609eea0cfe124b827098aff6d2fc9a0.tar.bz2 embtoolkit-8efa332fa609eea0cfe124b827098aff6d2fc9a0.tar.xz | |
Build system: do not use non portable cp -d, which is GNU extension
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/gcc.mk | 28 | ||||
| -rw-r--r-- | mk/libc++/libc++/Makefile | 3 | ||||
| -rw-r--r-- | mk/rootfs.mk | 12 |
3 files changed, 23 insertions, 20 deletions
@@ -68,20 +68,20 @@ define embtk_install_gcc3 endef define __embtk_postinstall_libgcc - $(if $(CONFIG_EMBTK_32BITS_FS), \ - cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib/*.so* \ - $(embtk_sysroot)/lib/ && \ - cp $(embtk_tools)/$(STRICT_GNU_TARGET)/lib/*.a \ - $(embtk_sysroot)/usr/lib/ 2>/dev/null || true) \ - $(if $(CONFIG_EMBTK_64BITS_FS), \ - cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib64/*.so* \ - $(embtk_sysroot)/lib/ && \ - cp $(embtk_tools)/$(STRICT_GNU_TARGET)/lib64/*.a \ - $(embtk_sysroot)/usr/lib/ 2>/dev/null || true) \ - $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), \ - cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib32/*.so* \ - $(embtk_sysroot)/lib32/ && \ - cp $(embtk_tools)/$(STRICT_GNU_TARGET)/lib32/*.a \ + $(if $(CONFIG_EMBTK_32BITS_FS), \ + (cd $(embtk_tools)/$(STRICT_GNU_TARGET)/lib/ && tar -cf - *.so*) \ + | tar -xf - -C $(embtk_sysroot)/lib/ && \ + cp $(embtk_tools)/$(STRICT_GNU_TARGET)/lib/*.a \ + $(embtk_sysroot)/usr/lib/ 2>/dev/null || true) \ + $(if $(CONFIG_EMBTK_64BITS_FS), \ + (cd $(embtk_tools)/$(STRICT_GNU_TARGET)/lib64/ && tar -cf - *.so*) \ + | tar -xf - -C $(embtk_sysroot)/lib/ && \ + cp $(embtk_tools)/$(STRICT_GNU_TARGET)/lib64/*.a \ + $(embtk_sysroot)/usr/lib/ 2>/dev/null || true) \ + $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), \ + (cd $(embtk_tools)/$(STRICT_GNU_TARGET)/lib32/ && tar -cf - *.so*) \ + | tar -xf - -C $(embtk_sysroot)/lib32/ && \ + cp $(embtk_tools)/$(STRICT_GNU_TARGET)/lib32/*.a \ $(embtk_sysroot)/usr/lib32/ 2>/dev/null || true) endef diff --git a/mk/libc++/libc++/Makefile b/mk/libc++/libc++/Makefile index 3541ebf..da95cab 100644 --- a/mk/libc++/libc++/Makefile +++ b/mk/libc++/libc++/Makefile @@ -67,8 +67,7 @@ define __lib_install chmod 755 $(SYSROOT)/usr/include/c++/v1/ext chmod 644 $(SYSROOT)/usr/include/c++/v1/ext/* mkdir -p $(SYSROOT)/$(LIBDIR) - cp -d $(SHAREDLIB_NAME) $(SYSROOT)/$(LIBDIR)/ - cp -d $(SHAREDLIB_LINK) $(SYSROOT)/$(LIBDIR)/ + tar -cf - *.so* | tar -xf - -C $(SYSROOT)/$(LIBDIR)/ cp lib$(LIB)_nonshared.a $(SYSROOT)/usr/$(LIBDIR)/) endef diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 2d25824..723c065 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -117,13 +117,17 @@ define __embtk_rootfs_components_install $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), cd $(embtk_rootfs); ln -s lib lib64 cd $(embtk_rootfs)/usr; ln -s lib lib64) - -cp -d $(embtk_sysroot)/lib/*.so* $(embtk_rootfs)/lib/ - -cp -d $(embtk_sysroot)/usr/lib/*.so* $(embtk_rootfs)/usr/lib/ + -(cd $(embtk_sysroot)/lib/ && tar -cf - *.so*) \ + | tar -xf - -C $(embtk_rootfs)/lib/ + -(cd $(embtk_sysroot)/usr/lib/ && tar -cf - *.so*) \ + | tar -xf - -C $(embtk_rootfs)/usr/lib/ rm -rf $(embtk_rootfs)/lib/libgcc_s.so rm -rf $(embtk_rootfs)/usr/lib/libc.so $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), - -cp -d $(embtk_sysroot)/lib32/*.so* $(embtk_rootfs)/lib32/ - -cp -d $(embtk_sysroot)/usr/lib32/*.so* $(embtk_rootfs)/usr/lib32/ + -(cd $(embtk_sysroot)/lib32/ && tar -cf - *.so*) \ + | tar -xf - -C $(embtk_rootfs)/lib32/ + -(cd $(embtk_sysroot)/usr/lib32/ && tar -cf - *.so*) \ + | tar -xf - -C $(embtk_rootfs)/usr/lib32/ rm -rf $(embtk_rootfs)/lib32/libgcc_s.so rm -rf $(embtk_rootfs)/usr/lib32/libc.so) -cp -R $(embtk_sysroot)/bin/* $(embtk_rootfs)/bin/ >/dev/null 2>/dev/null |