From 71c91ce903a90de852b5d66a27a673ff6e785cee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Sep 2009 20:13:11 +0200 Subject: fix some eglibc adk buildsystem problems --- package/gcc/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 813a8241f..6c28e0f4c 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -46,6 +46,7 @@ ifeq ($(ADK_TARGET_LIB_UCLIBC),y) ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib else ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib + ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GCC}/usr/lib endif rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools -- cgit v1.2.3 From c111f14db1b4558ebf5b2e894315c8e5217bf6fc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 16:08:36 +0100 Subject: make bulk build on Debian/lenny x86 complete - fix some menu descriptions - fix gcc package compile --- package/gcc/Makefile | 3 +-- package/gcc/patches/cross-gcc-fix.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 package/gcc/patches/cross-gcc-fix.patch (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index cbd9ee0db..b2f6266ef 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -15,11 +15,10 @@ $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}, TCFLAGS:= '' TCPPFLAGS:= '' -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y) CONFIGURE_ARGS+= --with-abi=64 endif -CONFIGURE_ENV+= ac_cv_func_fputc_unlocked=no CONFIGURE_ARGS+= --enable-languages=c,c++ \ --libexecdir=/usr/lib \ --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/package/gcc/patches/cross-gcc-fix.patch b/package/gcc/patches/cross-gcc-fix.patch new file mode 100644 index 000000000..9b5d55318 --- /dev/null +++ b/package/gcc/patches/cross-gcc-fix.patch @@ -0,0 +1,13 @@ +diff -Nur gcc-4.4.2.orig/gcc/Makefile.in gcc-4.4.2/gcc/Makefile.in +--- gcc-4.4.2.orig/gcc/Makefile.in 2009-07-25 19:53:35.000000000 +0200 ++++ gcc-4.4.2/gcc/Makefile.in 2009-11-22 15:30:27.000000000 +0100 +@@ -898,7 +898,8 @@ + # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro + # puts -I options in CPPFLAGS, our include files in the srcdir will always + # win against random include files in /usr/include. +-ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) ++#ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) ++ALL_CPPFLAGS = $(INCLUDES) + + # Build and host support libraries. + LIBIBERTY = ../libiberty/libiberty.a -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- package/gcc/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 0e6384a5b..074b9a711 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -8,6 +8,7 @@ PKG_DESCR:= GNU compiler collection PKG_SECTION:= comp PKG_DEPENDS:= mpfr PKG_OPTS:= noremove +PKG_BUILDDEP+= gmp mpfr include ${TOPDIR}/mk/package.mk -- cgit v1.2.3 From 150ccbfbc1f8ef012d0b38a7e6b3df573570555a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 20:59:07 +0100 Subject: fix more dependencies --- package/gcc/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 074b9a711..8d6c2203e 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -10,6 +10,8 @@ PKG_DEPENDS:= mpfr PKG_OPTS:= noremove PKG_BUILDDEP+= gmp mpfr +PKG_HOST_DEPENDS:= !freebsd + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -- cgit v1.2.3 From 2c3389799c46724a4922179ff70d1230ccbe5b59 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:34:44 +0100 Subject: fixes for new pkgmaker generated menu --- package/gcc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 8d6c2203e..f2820d144 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -6,8 +6,8 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc PKG_DESCR:= GNU compiler collection PKG_SECTION:= comp -PKG_DEPENDS:= mpfr PKG_OPTS:= noremove +PKG_DEPENDS:= libgmp mpfr PKG_BUILDDEP+= gmp mpfr PKG_HOST_DEPENDS:= !freebsd -- cgit v1.2.3 From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:37:42 +0100 Subject: remove and ignore autogenerated Config.in files --- package/gcc/Config.in | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 package/gcc/Config.in (limited to 'package/gcc') diff --git a/package/gcc/Config.in b/package/gcc/Config.in deleted file mode 100644 index 5cc23e6ca..000000000 --- a/package/gcc/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_PACKAGE_GCC - prompt "gcc............................... GNU Compiler Collection" - tristate - default n - select ADK_PACKAGE_LIBGMP - select ADK_PACKAGE_MPFR - depends on !ADK_HOST_FREEBSD - help - GCC - http://www.gnu.org/gcc -- cgit v1.2.3 From cae7454e8151e56da5f0b9f14a06fbcefe153a72 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 Jan 2010 11:11:18 +0100 Subject: rework libc-dev package, add linker script for x86 --- package/gcc/Makefile | 6 ------ 1 file changed, 6 deletions(-) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index f2820d144..4e613efef 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -51,12 +51,6 @@ post-install: ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/ cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp . ${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/ -ifeq ($(ADK_TARGET_LIB_UCLIBC),y) - ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib -else - ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib - ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GCC}/usr/lib -endif rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/gcc/Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 4e613efef..534395d7a 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -18,7 +18,6 @@ $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}, TCFLAGS:= '' TCPPFLAGS:= '' -CONFIGURE_STYLE:= gnu ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y) CONFIGURE_ARGS+= --with-abi=64 endif @@ -37,8 +36,6 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ \ --disable-libgomp \ --disable-multilib \ --disable-libstdcxx-pch -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin -- cgit v1.2.3 From 5dab5a73f1c0c545a121c9badd8e6d95a468fff0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 28 Feb 2010 15:08:25 +0100 Subject: unbreak gcc package for lemote --- package/gcc/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 534395d7a..20e99fff8 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -18,15 +18,12 @@ $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}, TCFLAGS:= '' TCPPFLAGS:= '' -ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y) -CONFIGURE_ARGS+= --with-abi=64 -endif CONFIGURE_ARGS+= --enable-languages=c,c++ \ - --libexecdir=/usr/lib \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ --disable-__cxa_atexit \ --without-headers \ + --libexecdir=/usr/lib \ --with-gnu-ld \ --disable-libssp \ --disable-nls \ -- cgit v1.2.3 From 27406b931af52dd138e1f0bbd809df73ce1a9c2f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 4 Mar 2010 19:11:16 +0100 Subject: fix gcc cross-compile --- package/gcc/Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 20e99fff8..36aa0f94c 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -10,6 +10,19 @@ PKG_OPTS:= noremove PKG_DEPENDS:= libgmp mpfr PKG_BUILDDEP+= gmp mpfr +ifeq ($(ADK_TARGET_LIB_UCLIBC),y) +PKG_DEPENDS:= uclibc-dev +PKG_BUILDDEP+= uclibc +endif +ifeq ($(ADK_TARGET_LIB_EGLIBC),y) +PKG_DEPENDS:= eglibc-dev +PKG_BUILDDEP+= eglibc +endif +ifeq ($(ADK_TARGET_LIB_GLIBC),y) +PKG_DEPENDS:= glibc-dev +PKG_BUILDDEP+= glibc +endif + PKG_HOST_DEPENDS:= !freebsd include ${TOPDIR}/mk/package.mk -- cgit v1.2.3 From 098558dc60eb34e655d614f7dab32cca446771a3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Mar 2010 18:21:03 +0100 Subject: fix gcc package on MIPS64 --- package/gcc/Makefile | 8 +++++- package/gcc/patches/mirbsd-compat.patch | 12 +++++++++ package/gcc/patches/no-lib64.patch | 47 +++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 package/gcc/patches/mirbsd-compat.patch create mode 100644 package/gcc/patches/no-lib64.patch (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 36aa0f94c..3c6e0b701 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -27,10 +27,15 @@ PKG_HOST_DEPENDS:= !freebsd include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TCFLAGS:= '' TCPPFLAGS:= '' + +ifeq ($(ADK_LINUX_64),y) +CONFIGURE_ARGS+= --with-abi=64 +endif + CONFIGURE_ARGS+= --enable-languages=c,c++ \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ @@ -53,6 +58,7 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/ cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++ + cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc ${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/ ${CP} ${WRKINST}/usr/lib/libstdc++*so* ${IDIR_GCC}/usr/lib/ ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/ diff --git a/package/gcc/patches/mirbsd-compat.patch b/package/gcc/patches/mirbsd-compat.patch new file mode 100644 index 000000000..2f3ea0c87 --- /dev/null +++ b/package/gcc/patches/mirbsd-compat.patch @@ -0,0 +1,12 @@ +diff -Nur gcc-4.4.2.orig/gcc/configure gcc-4.4.2/gcc/configure +--- gcc-4.4.2.orig/gcc/configure Tue Mar 24 18:45:39 2009 ++++ gcc-4.4.2/gcc/configure Sat Dec 19 21:07:07 2009 +@@ -19381,7 +19381,7 @@ + dynamic_linker='ldqnx.so' + ;; + +-openbsd*) ++mirbsd*|openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch new file mode 100644 index 000000000..add17ecb8 --- /dev/null +++ b/package/gcc/patches/no-lib64.patch @@ -0,0 +1,47 @@ +diff -Nur gcc-4.4.1.orig/gcc/config/i386/linux64.h gcc-4.4.1/gcc/config/i386/linux64.h +--- gcc-4.4.1.orig/gcc/config/i386/linux64.h 2009-04-10 01:23:07.000000000 +0200 ++++ gcc-4.4.1/gcc/config/i386/linux64.h 2009-08-21 18:34:13.000000000 +0200 +@@ -59,7 +59,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #undef ASM_SPEC + #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ +diff -Nur gcc-4.4.1.orig/gcc/config/i386/t-linux64 gcc-4.4.1/gcc/config/i386/t-linux64 +--- gcc-4.4.1.orig/gcc/config/i386/t-linux64 2008-07-02 17:59:19.000000000 +0200 ++++ gcc-4.4.1/gcc/config/i386/t-linux64 2009-08-21 18:34:13.000000000 +0200 +@@ -7,7 +7,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Nur gcc-4.4.1.orig/gcc/config/mips/linux64.h gcc-4.4.1/gcc/config/mips/linux64.h +--- gcc-4.4.1.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 ++++ gcc-4.4.1/gcc/config/mips/linux64.h 2009-08-21 18:37:19.000000000 +0200 +@@ -36,7 +36,7 @@ + %{profile:-lc_p} %{!profile:-lc}}" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ +diff -Nur gcc-4.4.1.orig/gcc/config/mips/t-linux64 gcc-4.4.1/gcc/config/mips/t-linux64 +--- gcc-4.4.1.orig/gcc/config/mips/t-linux64 2006-06-06 14:51:24.000000000 +0200 ++++ gcc-4.4.1/gcc/config/mips/t-linux64 2009-08-21 18:34:13.000000000 +0200 +@@ -1,6 +1,6 @@ + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib ../lib + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + -- cgit v1.2.3 From 8a45e26cfb92ab1738d107e7ed764c28b1184a71 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 6 Mar 2010 18:02:40 +0100 Subject: fix PKG_DEPENDS --- package/gcc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 3c6e0b701..4de63c4f7 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -11,15 +11,15 @@ PKG_DEPENDS:= libgmp mpfr PKG_BUILDDEP+= gmp mpfr ifeq ($(ADK_TARGET_LIB_UCLIBC),y) -PKG_DEPENDS:= uclibc-dev +PKG_DEPENDS+= uclibc-dev PKG_BUILDDEP+= uclibc endif ifeq ($(ADK_TARGET_LIB_EGLIBC),y) -PKG_DEPENDS:= eglibc-dev +PKG_DEPENDS+= eglibc-dev PKG_BUILDDEP+= eglibc endif ifeq ($(ADK_TARGET_LIB_GLIBC),y) -PKG_DEPENDS:= glibc-dev +PKG_DEPENDS+= glibc-dev PKG_BUILDDEP+= glibc endif -- cgit v1.2.3 From 4c2f0fd02b3e30fc7c96cc1b3343c0256ef5033f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 16 Mar 2010 18:45:03 +0100 Subject: do not build gcc for ag241, makes no sense --- package/gcc/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/gcc') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 4de63c4f7..b77895f5b 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -24,6 +24,7 @@ PKG_BUILDDEP+= glibc endif PKG_HOST_DEPENDS:= !freebsd +PKG_TARGET_DEPENDS:= !ag241 include ${TOPDIR}/mk/package.mk -- cgit v1.2.3