Skip to contentSkip to conversation

busybox 1.18.3: add wget and build system patches

PATCH New Gustavo Zacarias 2 participants 4 messages Feb 10, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 busybox 1.18.3: add wget and build system patches

---
 .../busybox-1.18.3/busybox-1.18.3-buildsys.patch   |   10 +++
 .../busybox-1.18.3/busybox-1.18.3-wget.patch       |   69 ++++++++++++++++++++
 2 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
 create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch
package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch new file +10 -0
new file mode 100644
index 0000000..330b73f
@@ -0,0 +1,10 @@
+--- busybox-1.18.3/Config.in
++++ busybox-1.18.3-buildsys/Config.in
+@@ -126,7 +126,6 @@ config FEATURE_INSTALLER
+ config INSTALL_NO_USR
+ 	bool "Don't use /usr"
+ 	default n
+-	depends on FEATURE_INSTALLER
+ 	help
+ 	  Disable use of /usr. busybox --install and "make install"
+ 	  will install applets only to /bin and /sbin,
package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch new file +69 -0

69 lines not on this page · raw message

Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 2/2 target gcc: fix recompilation issue

gcc_target wants uclibc_target which is now first stage uclibc (not real, from the NPTL build stage addition).
This triggers gcc-final to be rebuilt (albeit cached) and reinstalled, thus touching all the stamps around and triggering a rebuild of gcc_target.
Switch to $(STAMP_DIR)/gcc_libs_target_installed instead so that we only depend on the last stage of cross gcc being installed to rebuild.

---
 toolchain/gcc/gcc-uclibc-4.x.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
toolchain/gcc/gcc-uclibc-4.x.mk +1 -1
index 2c857dc..96bebd6 100644
@@ -558,7 +558,7 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled
 	#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
 	touch -c $@
 
-gcc_target: uclibc_target $(GCC_TARGET_PREREQ) binutils $(TARGET_DIR)/usr/bin/gcc
+gcc_target: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ) binutils $(TARGET_DIR)/usr/bin/gcc
 
 gcc_target-clean:
 	rm -rf $(GCC_BUILD_DIR4)
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 2/2 target gcc: fix recompilation issue

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> gcc_target wants uclibc_target which is now first stage uclibc (not Gustavo> real, from the NPTL build stage addition).
Gustavo> This triggers gcc-final to be rebuilt (albeit cached) and reinstalled, Gustavo> thus touching all the stamps around and triggering a rebuild of Gustavo> gcc_target.
Gustavo> Switch to $(STAMP_DIR)/gcc_libs_target_installed instead so that we only Gustavo> depend on the last stage of cross gcc being installed to rebuild.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard