eglibc: fix build issue with make-3.82
PATCH 1/2 eglibc: fix build issue with make-3.82
Add patch to fix this error when building eglibc-2.12 with make-3.82:
make[2]: Entering directory `eglibc-2_12/libc/manual' Makefile:246: *** mixed implicit and normal rules. Stop.
Signed-off-by Vasily Khoruzhick <[email protected]>
--- recipes/eglibc/eglibc_2.11.bb | 3 ++- recipes/eglibc/eglibc_2.12.bb | 3 ++- recipes/eglibc/files/eglibc-make-382.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 recipes/eglibc/files/eglibc-make-382.patch
recipes/eglibc/eglibc_2.11.bb +2 -1
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.11" -PR = "${INC_PR}.7" +PR = "${INC_PR}.8" PR_append = "+svnr${SRCPV}" SRCREV="10690" EGLIBC_BRANCH="eglibc-2_11"
@@ -14,6 +14,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://shorten-build-commands.patch \ file://sh4_set_fpscr.patch \ file://sh4_local-fpscr_values.patch \ + file://eglibc-make-382.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
recipes/eglibc/eglibc_2.12.bb +2 -1
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.12" -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" PR_append = "+svnr${SRCPV}" SRCREV="11762" EGLIBC_BRANCH="eglibc-2_12"
@@ -16,6 +16,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://sh4_local-fpscr_values.patch \ file://eglibc-dont-cache-slibdir.patch \ file://armv4-eabi-compile-fix.patch \ + file://eglibc-make-382.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
recipes/eglibc/files/eglibc-make-382.patch new file +15 -0
@@ -0,0 +1,15 @@ +http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=blob_plain;f=source/base/glibc/make-3.82-fix.patch;hb=8217c32ecc2e14962847ba3d8a272eb64a3dba4f + +--- libc/manual/Makefile ++++ libc/manual/Makefile +@@ -232,7 +232,9 @@ + .PHONY: stubs + stubs: $(objpfx)stubs + endif +-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: ++$(objpfx)stubs ../po/manual.pot: ++ touch $@ ++$(objpfx)stamp%: + $(make-target-directory) + touch $@ +
Signature · 1 line
1.7.3.2
PATCH 2/2 busybox: fix build issue with make-3.82
make-3.82 complains about mixed implicit and normal rules on busybox 1.15.x/1.16.x Makefile. 1.17.x versions are not affected.
Signed-off-by Vasily Khoruzhick <[email protected]>
--- recipes/busybox/busybox_1.15.3.bb | 3 ++- recipes/busybox/busybox_1.16.2.bb | 6 +++++- recipes/busybox/files/busybox-make-3-82.patch | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 recipes/busybox/files/busybox-make-3-82.patch
recipes/busybox/busybox_1.15.3.bb +2 -1
@@ -1,8 +1,9 @@ require busybox_1.1x.inc -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SRC_URI += "\ file://0000-wget-no-check-certificate.patch \ + file://busybox-make-3-82.patch \ " SRC_URI[md5sum] = "6059ac9456de6fb18dc8ee4cd0ec9240"
recipes/busybox/busybox_1.16.2.bb +5 -1
@@ -1,5 +1,9 @@ require busybox_1.1x.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" + +SRC_URI += "\ + file://busybox-make-3-82.patch \ +" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "1"
recipes/busybox/files/busybox-make-3-82.patch new file +20 -0
@@ -0,0 +1,20 @@ +--- busybox-1.7.4/Makefile.1 2010-10-26 19:31:29.040000217 +0300 ++++ busybox-1.7.4/Makefile 2010-10-26 19:39:14.010000218 +0300 +@@ -402,7 +402,7 @@ ifeq ($(config-targets),1) + -include $(srctree)/arch/$(ARCH)/Makefile + export KBUILD_DEFCONFIG + +-config %config: scripts_basic outputmakefile FORCE ++%config: scripts_basic outputmakefile FORCE + $(Q)mkdir -p include + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease +@@ -1240,7 +1240,7 @@ endif + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + + # Modules +-/ %/: prepare scripts FORCE ++%/: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) + %.ko: prepare scripts FORCE
Signature · 1 line
1.7.3.2
PATCH v2 1/2 eglibc: fix build issue with make-3.82
In reply to Vasily KhoruzhickAdd patch to fix this error when building eglibc-2.11, eglibc-2.12 with make-3.82:
make[2]: Entering directory `eglibc-2_12/libc/manual' Makefile:246: *** mixed implicit and normal rules. Stop.
Signed-off-by Vasily Khoruzhick <[email protected]>
---
Add fixed eglibc versions to patch comment
recipes/eglibc/eglibc_2.11.bb | 3 ++- recipes/eglibc/eglibc_2.12.bb | 3 ++- recipes/eglibc/files/eglibc-make-382.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 recipes/eglibc/files/eglibc-make-382.patch
recipes/eglibc/eglibc_2.11.bb +2 -1
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.11" -PR = "${INC_PR}.7" +PR = "${INC_PR}.8" PR_append = "+svnr${SRCPV}" SRCREV="10690" EGLIBC_BRANCH="eglibc-2_11"
@@ -14,6 +14,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://shorten-build-commands.patch \ file://sh4_set_fpscr.patch \ file://sh4_local-fpscr_values.patch \ + file://eglibc-make-382.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
recipes/eglibc/eglibc_2.12.bb +2 -1
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.12" -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" PR_append = "+svnr${SRCPV}" SRCREV="11762" EGLIBC_BRANCH="eglibc-2_12"
@@ -16,6 +16,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://sh4_local-fpscr_values.patch \ file://eglibc-dont-cache-slibdir.patch \ file://armv4-eabi-compile-fix.patch \ + file://eglibc-make-382.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
recipes/eglibc/files/eglibc-make-382.patch new file +15 -0
@@ -0,0 +1,15 @@ +http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=blob_plain;f=source/base/glibc/make-3.82-fix.patch;hb=8217c32ecc2e14962847ba3d8a272eb64a3dba4f + +--- libc/manual/Makefile ++++ libc/manual/Makefile +@@ -232,7 +232,9 @@ + .PHONY: stubs + stubs: $(objpfx)stubs + endif +-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: ++$(objpfx)stubs ../po/manual.pot: ++ touch $@ ++$(objpfx)stamp%: + $(make-target-directory) + touch $@ +
Signature · 1 line
1.7.3.2