projects
/
openwrt
/
staging
/
florian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ca686b
)
fix libraries packaging for uml on x86_64
author
Nicolas Thill
<nico@openwrt.org>
Mon, 28 Jul 2008 14:19:02 +0000
(14:19 +0000)
committer
Nicolas Thill
<nico@openwrt.org>
Mon, 28 Jul 2008 14:19:02 +0000
(14:19 +0000)
SVN-Revision: 11970
package/base-files/Makefile
patch
|
blob
|
history
diff --git
a/package/base-files/Makefile
b/package/base-files/Makefile
index bec33c8e05dd32b31bb05a4e5534c52c954c3849..5ab776df51345f8c2e8a31b738048f1b65abd8ac 100644
(file)
--- a/
package/base-files/Makefile
+++ b/
package/base-files/Makefile
@@
-22,6
+22,9
@@
ifneq ($(DUMP),1)
TARGET:=$(TARGET)-$(PROFILE)
endif
LIBGCC_VERSION:=$(GCC_VERSION)
TARGET:=$(TARGET)-$(PROFILE)
endif
LIBGCC_VERSION:=$(GCC_VERSION)
+ ifeq ($(ARCH),x86_64)
+ LIB_SUFFIX:=64
+ endif
else
UCLIBC_VERSION:=<UCLIBC_VERSION>
LIBGCC_VERSION:=<LIBGCC_VERSION>
else
UCLIBC_VERSION:=<UCLIBC_VERSION>
LIBGCC_VERSION:=<LIBGCC_VERSION>
@@
-173,19
+176,19
@@
endef
define Package/libgcc/install
$(INSTALL_DIR) $(1)/lib
define Package/libgcc/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib
$(LIB_SUFFIX)
/libgcc_s.so.* $(1)/lib/
endef
ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
define Package/libssp/install
$(INSTALL_DIR) $(1)/lib
endef
ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
define Package/libssp/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib
$(LIB_SUFFIX)
/libssp.so.* $(1)/lib/
endef
endif
define Package/libstdcpp/install
$(INSTALL_DIR) $(1)/lib
endef
endif
define Package/libstdcpp/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib
$(LIB_SUFFIX)
/libstdc++.so.* $(1)/lib/
endef
define Package/libpthread/install
endef
define Package/libpthread/install
@@
-196,7
+199,7
@@
endef
define Package/uclibc/install
$(INSTALL_DIR) $(1)/lib
define Package/uclibc/install
$(INSTALL_DIR) $(1)/lib
- for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
+ for file in ld
$(LIB_SUFFIX)
-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
done
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
done