fix make allmodconfig on mips (rb532)

mk/cpu.mk

@@ -13,7 +13,6 @@ CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
 else
 CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
 			--disable-sse \
-			--disable-mmxext \
 			--disable-amd3dnow \
 			--disable-amd3dnowext \
 			--disable-mmx \

package/axtls/Makefile

@@ -27,7 +27,7 @@ $(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PK
 BUILD_STYLE=		auto
 XAKE_FLAGS+=		STRIP='' \
 			CC='${TARGET_CC}' \
-			OPT_CFLAGS='${TARGET_CFLAGS}' \
+			OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \
 			OPT_LDFLAGS=""
 
 do-configure:

package/binutils/Makefile

@@ -11,6 +11,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-fPIC
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-werror
 BUILD_STYLE=		auto

package/cbtt/Makefile

@@ -40,6 +40,7 @@ TLDFLAGS+=		-nodefaultlibs -lz -lpthread \
 			-luClibc++ -lc -lm -lgcc
 TCFLAGS+=		-fno-builtin -nostdinc++
 endif
+TCFLAGS+=		-fPIC
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CBTT}/usr/bin

package/cxxtools/Makefile

@@ -30,6 +30,8 @@ else
 TLDFLAGS+=		-liconv -shared
 endif
 
+TCFLAGS+=		-fPIC
+TCXXFLAGS+=		-fPIC
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_lib_nsl_setsockopt=no
 CONFIGURE_ARGS+=	--with-libiconv-prefix='${STAGING_DIR}/usr'

package/gpg/patches/patch-mpi_longlong_h

@@ -0,0 +1,67 @@
+--- gnupg-1.4.9.orig/mpi/longlong.h	2007-10-23 11:15:14.000000000 +0200
++++ gnupg-1.4.9/mpi/longlong.h	2009-06-19 19:16:25.000000000 +0200
+@@ -706,18 +706,35 @@ extern USItype __udiv_qrnnd ();
+ #endif /* __m88110__ */
+ #endif /* __m88000__ */
+ 
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __GNUC_PREREQ(maj, min) \
++  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __GNUC_PREREQ(maj, min)  0
++#endif
++
+ /***************************************
+  **************  MIPS  *****************
+  ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {                                                                 \
++    UDItype __ll = (UDItype)(u) * (v);                                 \
++    w1 = __ll >> 32;                                                   \
++    w0 = __ll;                                                         \
++  } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3"                                                \
+ 	   : "=l" ((USItype)(w0)),                                      \
+ 	     "=h" ((USItype)(w1))                                       \
+ 	   : "d" ((USItype)(u)),                                        \
+ 	     "d" ((USItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3 \n" \
+ 	   "mflo %0 \n"     \
+@@ -735,14 +752,24 @@ extern USItype __udiv_qrnnd ();
+  **************  MIPS/64  **************
+  ***************************************/
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {                                                                 \
++    typedef unsigned int __ll_UTItype __attribute__((mode(TI)));       \
++    __ll_UTItype __ll = (__ll_UTItype)(u) * (v);                       \
++    w1 = __ll >> 64;                                                   \
++    w0 = __ll;                                                         \
++  } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3"                                               \
+ 	   : "=l" ((UDItype)(w0)),                                      \
+ 	     "=h" ((UDItype)(w1))                                       \
+ 	   : "d" ((UDItype)(u)),                                        \
+ 	     "d" ((UDItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3 \n"    \
+ 	   "mflo %0 \n"         \

package/gsm/Makefile

@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
-XAKE_FLAGS+=		COPTS="${TARGET_CFLAGS}" \
+XAKE_FLAGS+=		COPTS="${TARGET_CFLAGS} -fPIC" \
 			INSTALL_ROOT="${WRKINST}"
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto

package/id3lib/Config.in

@@ -4,6 +4,7 @@ config ADK_PACKAGE_ID3LIB
 	default n
 	depends on ADK_CXX
 	select ADK_PACKAGE_ZLIB
+	select ADK_PACKAGE_LIBICONV
 	help
 	  An ID3v1/ID3v2 tagging library.
 

package/id3lib/Makefile

@@ -23,6 +23,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-fPIC
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-cxx-warnings=no
 BUILD_STYLE:=		auto

package/ipset/Makefile

@@ -19,8 +19,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
-			PREFIX=/usr LD=$(TARGET_CROSS)ld \
-			CROSS_COMPILE="${TARGET_CROSS}"
+			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
+			LD=$(TARGET_CROSS)gcc
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 INSTALL_TARGET=		binaries_install

package/libiconv/Makefile

@@ -16,6 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-fPIC
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto confprog

package/libmad/Makefile

@@ -21,16 +21,17 @@ FPM:=default
 ifeq (${ARCH},i386)
 FPM:=intel
 endif
-ifeq (${ARCH},mips)
-FPM:=mips
-endif
+# MIPS optimization is broken for gcc 4.4 (removed h constraint)
+#ifeq (${ARCH},mips)
+#FPM:=mips
+#endif
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-fpm=${FPM} \
 			--disable-debugging \
 			--enable-speed
 BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+INSTALL_STYLE=		auto
 
 pre-install:
 	${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig

package/libupnp/Makefile

@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-fPIC
 CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ARGS+=	--disable-samples
 BUILD_STYLE:=		auto

package/monit/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- monit-5.0.3.orig/Makefile.in	2009-05-25 21:02:56.000000000 +0200
++++ monit-5.0.3/Makefile.in	2009-06-19 21:30:29.000000000 +0200
+@@ -36,7 +36,7 @@ MODE_CONF       = 600
+ MODE_DIRS       = 755
+ 
+ INSTALL         = @INSTALL@ 
+-INSTALL_PROG    = $(INSTALL) -m $(MODE_PROGS) -s
++INSTALL_PROG    = $(INSTALL) -m $(MODE_PROGS)
+ INSTALL_FILE    = $(INSTALL) -m $(MODE_FILES)
+ INSTALL_DIR     = $(INSTALL) -m $(MODE_DIRS) -d
+ 

package/mplayer/Config.in

@@ -2,16 +2,17 @@ config ADK_PACKAGE_MPLAYER
 	prompt "mplayer........................... popular movie player"
 	tristate
 	default n
+	select ADK_PACKAGE_ALSA_LIB
 	select ADK_PACKAGE_LIBJPEG
 	select ADK_PACKAGE_LIBPNG
 	select ADK_PACKAGE_LIBPTHREAD
 	select ADK_PACKAGE_LIBOGG
-	select ADK_PACKAGE_LIBVORBIS
 	select ADK_PACKAGE_LIBMAD
-	select ADK_PACKAGE_ALSA_LIB
-	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBFAAD2
+	select ADK_PACKAGE_LIBVORBIS
+	select ADK_PACKAGE_ZLIB
+	depends on ADK_LINUX_X86_ALIX1C
 	help
           http://www.mplayerhq.hu
 

package/mplayer/Makefile

@@ -55,7 +55,6 @@ pre-configure:
 		--prefix=/usr \
 		--confdir=/etc \
 		--enable-cross-compile \
-		--enable-runtime-cpudetection \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--cc=$(TARGET_CC) \
 		--host-cc=$(HOSTCC) \

package/mrd6/patches/patch-src_linux_mrd_components_cpp

@@ -0,0 +1,14 @@
+--- mrd6-0.9.6.orig/src/linux/mrd_components.cpp	2007-01-07 03:11:27.000000000 +0100
++++ mrd6-0.9.6/src/linux/mrd_components.cpp	2009-06-19 21:49:44.000000000 +0200
+@@ -90,10 +90,8 @@ char *mrd::obtain_frame_description(void
+ 
+ void *mrd::posix_uctx::get_current_frame() const {
+ #if defined(__GLIBC__)
+-#if defined(__i386__)
++#if defined(__i386__) 
+ 	return (void *)base->uc_mcontext.gregs[REG_EIP];
+-#elif defined(__mips__)
+-	return (void *)base->uc_mcontext.gpregs[CTX_EPC];
+ #endif
+ #endif
+ 	return 0;

package/opensips/Makefile

@@ -92,7 +92,7 @@ do-build:
 		CC="$(TARGET_CC)" \
 		OS="linux" \
 		ARCH="$(ARCH)"  \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
 		LOCALBASE="$(STAGING_DIR)/usr" \
 		SYSBASE="$(STAGING_DIR)/usr" \
 		all modules

package/oprofile/Makefile

@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,OPROFILE,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TLDFLAGS+=		-shared
+TCFLAGS+=		-fPIC
+TCXXFLAGS+=		-fPIC
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-kernel-support --with-linux=${LINUX_DIR}
 BUILD_STYLE=		auto

package/portmap/Makefile

@@ -29,6 +29,7 @@ else
 MAKE_FLAGS+=		NO_TCP_WRAPPER=1
 endif
 TCPPFLAGS+=		-DDAEMON_UID=20 -DDAEMON_GID=20
+TCFLAGS+=		-fPIC
 BUILD_STYLE:=		auto
 MAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} \
 			CFLAGS='${TCFLAGS}'

package/rrs/Makefile

@@ -29,10 +29,10 @@ $(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
 $(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
-PKG_CFLAGS=-fno-builtin -fno-rtti -nostdinc++
+PKG_FLAGS=-fno-builtin -fno-rtti -nostdinc++ -fPIC
 PKG_LDFLAGS=-nodefaultlibs -luClibc++ -lc -lm
 else
-PKG_CFLAGS=
+PKG_FLAGS=-fPIC
 PKG_LDFLAGS=-shared
 endif
 

package/sane-backends/patches/patch-configure_in

@@ -0,0 +1,11 @@
+--- sane-backends-1.0.20.orig/configure.in	2009-05-03 03:25:23.000000000 +0200
++++ sane-backends-1.0.20/configure.in	2009-06-19 23:27:39.000000000 +0200
+@@ -513,7 +513,7 @@ ALL_BACKENDS="abaton agfafocus apple art
+         hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+         matsushita microtek microtek2 mustek mustek_pp \
+         mustek_usb mustek_usb2 nec net niash pie pint \
+-        pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
++        pixma plustek plustek_pp ricoh rts8891 s9036 \
+         sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
+         stv680 tamarack teco1 teco2 teco3 test u12 umax 
+         umax_pp umax1220u v4l xerox_mfp"

package/uclibc++/files/config

@@ -15,7 +15,7 @@ HAVE_DOT_CONFIG=y
 #
 # String and I/O Stream Support
 #
-UCLIBCXX_HAS_WCHAR=y
+# UCLIBCXX_HAS_WCHAR is not set
 UCLIBCXX_IOSTREAM_BUFSIZE=32
 UCLIBCXX_HAS_LFS=y
 UCLIBCXX_SUPPORT_CDIR=y
@@ -23,10 +23,6 @@ UCLIBCXX_SUPPORT_CIN=y
 UCLIBCXX_SUPPORT_COUT=y
 UCLIBCXX_SUPPORT_CERR=y
 # UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
 
 #
 # STL and Code Expansion
@@ -51,7 +47,7 @@ UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
 UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
 UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
 UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
+# IMPORT_LIBSUP is not set
 # IMPORT_LIBGCC_EH is not set
 # BUILD_STATIC_LIB is not set
 # DODEBUG is not set

package/uclibc++/files/config.mips

@@ -1,57 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Features and Options
-#
-UCLIBCXX_HAS_FLOATS=y
-# UCLIBCXX_HAS_LONG_DOUBLE is not set
-# UCLIBCXX_HAS_TLS is not set
-WARNINGS="-Wall"
-BUILD_EXTRA_LIBRARIES=""
-HAVE_DOT_CONFIG=y
-
-#
-# String and I/O Stream Support
-#
-UCLIBCXX_HAS_WCHAR=y
-UCLIBCXX_IOSTREAM_BUFSIZE=32
-UCLIBCXX_HAS_LFS=y
-UCLIBCXX_SUPPORT_CDIR=y
-UCLIBCXX_SUPPORT_CIN=y
-UCLIBCXX_SUPPORT_COUT=y
-UCLIBCXX_SUPPORT_CERR=y
-# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
-
-#
-# STL and Code Expansion
-#
-UCLIBCXX_STL_BUFFER_SIZE=32
-UCLIBCXX_CODE_EXPANSION=y
-# UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS is not set
-UCLIBCXX_EXPAND_STRING_CHAR=y
-UCLIBCXX_EXPAND_VECTOR_BASIC=y
-# UCLIBCXX_EXPAND_IOS_CHAR is not set
-# UCLIBCXX_EXPAND_STREAMBUF_CHAR is not set
-UCLIBCXX_EXPAND_ISTREAM_CHAR=y
-UCLIBCXX_EXPAND_OSTREAM_CHAR=y
-UCLIBCXX_EXPAND_FSTREAM_CHAR=y
-# UCLIBCXX_EXPAND_SSTREAM_CHAR is not set
-
-#
-# Library Installation Options
-#
-UCLIBCXX_RUNTIME_PREFIX=""
-UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
-UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
-UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
-UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
-# IMPORT_LIBGCC_EH is not set
-# BUILD_STATIC_LIB is not set
-# DODEBUG is not set

package/uclibc++/files/config.x86

@@ -1,57 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Features and Options
-#
-UCLIBCXX_HAS_FLOATS=y
-# UCLIBCXX_HAS_LONG_DOUBLE is not set
-# UCLIBCXX_HAS_TLS is not set
-WARNINGS="-Wall"
-BUILD_EXTRA_LIBRARIES=""
-HAVE_DOT_CONFIG=y
-
-#
-# String and I/O Stream Support
-#
-UCLIBCXX_HAS_WCHAR=y
-UCLIBCXX_IOSTREAM_BUFSIZE=32
-UCLIBCXX_HAS_LFS=y
-UCLIBCXX_SUPPORT_CDIR=y
-UCLIBCXX_SUPPORT_CIN=y
-UCLIBCXX_SUPPORT_COUT=y
-UCLIBCXX_SUPPORT_CERR=y
-# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
-
-#
-# STL and Code Expansion
-#
-UCLIBCXX_STL_BUFFER_SIZE=32
-UCLIBCXX_CODE_EXPANSION=y
-# UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS is not set
-UCLIBCXX_EXPAND_STRING_CHAR=y
-UCLIBCXX_EXPAND_VECTOR_BASIC=y
-# UCLIBCXX_EXPAND_IOS_CHAR is not set
-# UCLIBCXX_EXPAND_STREAMBUF_CHAR is not set
-UCLIBCXX_EXPAND_ISTREAM_CHAR=y
-UCLIBCXX_EXPAND_OSTREAM_CHAR=y
-UCLIBCXX_EXPAND_FSTREAM_CHAR=y
-# UCLIBCXX_EXPAND_SSTREAM_CHAR is not set
-
-#
-# Library Installation Options
-#
-UCLIBCXX_RUNTIME_PREFIX=""
-UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
-UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
-UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
-UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
-# IMPORT_LIBGCC_EH is not set
-# BUILD_STATIC_LIB is not set
-# DODEBUG is not set