Skip to contentSkip to conversation

gcc-final: Drop obsolete code for handling lib64

PATCH New Markos Chandras 3 participants 3 messages Aug 28, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gcc-final: Drop obsolete code for handling lib64

Since 5628776c4a4d29d0715633ea463b64cc19e19c5a
"toolchain-external: fix lib64 symlinks"

lib64 is a symlink to lib so there is no reason to copy the libraries to lib64 anymore. This fixes multiple building problems for buildroot toolchains:

[...]
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libuClibc-0.9.33.2.so' and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libuClibc-0.9.33.2.so' are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil-0.9.33.2.so' and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil-0.9.33.2.so' are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil.so.0' and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil.so.0' are the same file
rmdir: failed to remove 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64': Not a directory [...]

---
 package/gcc/gcc-final/gcc-final.mk | 14 --------------
 1 file changed, 14 deletions(-)
package/gcc/gcc-final/gcc-final.mk +0 -14
index 9f54c68..b62dfe2 100644
@@ -55,20 +55,6 @@ endif
 HOST_GCC_FINAL_CONF_OPT += \
 	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
-# Handle lib64
-define HOST_GCC_FINAL_HANDLE_LIB64
-	if [ -d "$(STAGING_DIR)/lib64" ]; then \
-		if [ ! -e "$(STAGING_DIR)/lib" ]; then \
-			mkdir -p "$(STAGING_DIR)/lib"; \
-		fi; \
-		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
-		rmdir "$(STAGING_DIR)/lib64"; \
-		rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\
-	fi
-endef
-
-HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_HANDLE_LIB64
-
 # Make sure we have 'cc'
 define HOST_GCC_FINAL_CREATE_CC_SYMLINKS
 	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 gcc-final: Drop obsolete code for handling lib64

Dear Markos Chandras,

Quoted 21 lines · Markos Chandras

Since 5628776c4a4d29d0715633ea463b64cc19e19c5a
"toolchain-external: fix lib64 symlinks"

lib64 is a symlink to lib so there is no reason to copy the libraries to lib64 anymore. This fixes multiple building problems for buildroot toolchains:

[...]
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libuClibc-0.9.33.2.so' and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libuClibc-0.9.33.2.so' are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil-0.9.33.2.so' and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil-0.9.33.2.so' are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil.so.0' and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil.so.0' are the same file
rmdir: failed to remove 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64': Not a directory [...]

Quoted 1 line

Thanks.

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 gcc-final: Drop obsolete code for handling lib64

In reply to Markos Chandras
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Markos" == Markos Chandras <[email protected]> writes:

Markos> Since 5628776c4a4d29d0715633ea463b64cc19e19c5a Markos> "toolchain-external: fix lib64 symlinks"

Markos> lib64 is a symlink to lib so there is no reason to copy the libraries Markos> to lib64 anymore. This fixes multiple building problems Markos> for buildroot toolchains:

Markos> [...]
Markos> mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libuClibc-0.9.33.2.so' Markos> and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libuClibc-0.9.33.2.so' Markos> are the same file
Markos> mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil-0.9.33.2.so' Markos> and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil-0.9.33.2.so' Markos> are the same file
Markos> mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil.so.0' Markos> and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil.so.0' Markos> are the same file
Markos> rmdir: failed to remove
Markos> 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64': Not a directory Markos> [...]

Markos> Signed-off-by: Markos Chandras <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard