Bladeren bron

fix some allmodconfig issues for mips target

Waldemar Brodkorb 13 jaren geleden
bovenliggende
commit
d9759be649

+ 1 - 1
mk/vars.mk

@@ -52,7 +52,7 @@ TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
 
 TARGET_CPPFLAGS:=	-I${STAGING_TARGET_DIR}/usr/include
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
-TARGET_CXXFLAGS:=
+TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
 TARGET_LDFLAGS:=	-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
 			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib

+ 1 - 0
package/alix-switch/Makefile

@@ -10,6 +10,7 @@ PKG_DESCR:=		daemon listening on button events
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
 
+PKG_CFLINE_ALIX_SWITCH:=depends on (ADK_TARGET_SYSTEM_ALIX2D2 || ADK_TARGET_SYSTEM_ALIX2D13)
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk

+ 1 - 0
package/axtls/Makefile

@@ -28,6 +28,7 @@ $(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PK
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-fPIC
 XAKE_FLAGS+=		STRIP='' \
 			CC='${TARGET_CC}'
 

+ 1 - 0
package/firefox/Makefile

@@ -68,6 +68,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-necko-wifi \
 			--disable-svg \
 			--disable-mathml \
+			--disable-jemalloc \
 			--disable-crashreporter
 
 XAKE_FLAGS+=		OS_RELEASE="2.6"

+ 1 - 0
package/frickin/Makefile

@@ -10,6 +10,7 @@ PKG_MD5SUM:=		5b2e98da2310c71c703d4617b88a173f
 PKG_DESCR:=		PPTP proxy
 PKG_SECTION:=		proxy
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=frickin/}
+PKG_NOPARALLEL:=	1
 
 include ${TOPDIR}/mk/package.mk
 

+ 1 - 0
package/gpm/Makefile

@@ -11,6 +11,7 @@ PKG_DESCR:=		console mouse support
 PKG_SECTION:=		misc
 PKG_URL:=		http://launchpad.net/gpm
 PKG_SITES:=		http://launchpad.net/gpm/main/${PKG_VERSION}/+download/
+PKG_NOPARALLEL:=	1
 
 include ${TOPDIR}/mk/package.mk
 

+ 1 - 1
package/jamvm/Makefile

@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_ARCH_DEPENDS:=	!cris
+PKG_ARCH_DEPENDS:=	!cris !mips
 
 include ${TOPDIR}/mk/package.mk
 

+ 3 - 4
package/kismet/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		kismet
-PKG_VERSION:=		2010-01-R1
+PKG_VERSION:=		2011-01-R1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a6d6edcf65d5bb2cb5de6472bcc16f19
+PKG_MD5SUM:=		1fb1f024a7ca52814b255e2f2faccf3b
 PKG_DESCR:=		Kismet
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libpcap libncurses
@@ -26,8 +26,7 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE
 $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION}))
 $(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet \
-			--disable-linuxwext
+CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet
 
 pre-build:
 	(cd ${WRKBUILD} && ${MAKE} dep);

+ 16 - 41
package/kismet/patches/patch-Makefile_in

@@ -1,17 +1,18 @@
---- kismet-2010-01-R1.orig/Makefile.in	Mon Dec 14 20:04:11 2009
-+++ kismet-2010-01-R1/Makefile.in	Wed Feb 17 22:09:41 2010
-@@ -100,25 +100,25 @@ commoninstall:
- 	mkdir -p $(ETC)
- 	mkdir -p $(BIN)
+--- kismet-2011-01-R1.orig/Makefile.in	2010-12-19 15:20:16.000000000 +0100
++++ kismet-2011-01-R1/Makefile.in	2011-02-04 23:14:39.000000000 +0100
+@@ -112,26 +112,26 @@ commoninstall:
  
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC)
+ 	if test -e $(NC); then \
+ 		echo "Installing client"; \
+-		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet; \
+-		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC); \
++		$(INSTALL) -m 555 scripts/kismet $(BIN)/kismet; \
++		$(INSTALL) -m 555 $(NC) $(BIN)/$(NC); \
+ 	fi;
 -	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS); 
 -	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
-+	$(INSTALL) -m 755 scripts/kismet $(BIN)/kismet
-+	$(INSTALL) -m 755 $(NC) $(BIN)/$(NC)
-+	$(INSTALL) -m 755 $(PS) $(BIN)/$(PS); 
-+	$(INSTALL) -m 755 $(DRONE) $(BIN)/$(DRONE);
++	$(INSTALL) -m 555 $(PS) $(BIN)/$(PS); 
++	$(INSTALL) -m 555 $(DRONE) $(BIN)/$(DRONE);
  
  	mkdir -p $(MAN)/man1
 -	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
@@ -39,47 +40,21 @@
  
  suidinstall: $(CS)
  	-groupadd -f $(SUIDGROUP)
-@@ -129,8 +129,8 @@ suidinstall: $(CS)
+@@ -174,7 +174,7 @@ install: $(INSTBINS)
  		echo "if there have been any changes to the base config you will need"; \
  		echo "to add them to your config file."; \
      else \
 -		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
 +		$(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+ 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
  		echo "Installed config into $(ETC)/kismet.conf."; \
  	fi
- 	@if test -f $(ETC)/kismet_drone.conf; then \
-@@ -138,8 +138,8 @@ suidinstall: $(CS)
+@@ -183,7 +183,7 @@ install: $(INSTBINS)
  		echo "if there have been any changes to the base config you will need"; \
  		echo "to add them to your config file."; \
      else \
 -		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
 +		$(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+ 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
  		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
  	fi
- 
-@@ -161,8 +161,8 @@ install: $(PS) $(CS) $(DRONE) $(NC)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		$(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
- 		echo "Installed config into $(ETC)/kismet.conf."; \
- 	fi
- 	@if test -f $(ETC)/kismet_drone.conf; then \
-@@ -170,8 +170,8 @@ install: $(PS) $(CS) $(DRONE) $(NC)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		$(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
- 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
- 	fi
- 	@echo "Installed kismet into $(BIN)/."

+ 0 - 98
package/kismet/patches/patch-configure

@@ -1,98 +0,0 @@
---- kismet-2010-01-R1.orig/configure	Fri Jan  8 00:33:30 2010
-+++ kismet-2010-01-R1/configure	Wed Feb 17 21:59:01 2010
-@@ -26,9 +26,10 @@ esac
- 
- fi
- 
-+oCC="$CC"
-+CC="$CXX"
- 
- 
--
- # PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-@@ -6836,74 +6837,7 @@ else
- $as_echo "yes" >&6; }
- fi
- 
--# Do we use libstdc++?
--# We need to swap to the g++ compiler here
--oCC="$CC"
--CC="$CXX"
--{ $as_echo "$as_me:$LINENO: checking for main in -luClibc++" >&5
--$as_echo_n "checking for main in -luClibc++... " >&6; }
--if test "${ac_cv_lib_uClibcpp_main+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-luClibc++  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--
--int
--main ()
--{
--return main ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_lib_uClibcpp_main=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_uClibcpp_main=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uClibcpp_main" >&5
--$as_echo "$ac_cv_lib_uClibcpp_main" >&6; }
--if test "x$ac_cv_lib_uClibcpp_main" = x""yes; then
--  foundcxxl="uclibc" CXXLIBS="$CXXLIBS -luClibc++"
--fi
--
--
- # Do we use uclibc++?
- if test "$foundcxxl"x == "x"; then
- 	{ $as_echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
-@@ -7017,7 +6951,7 @@ fi
- 
- 
- # Add additional cflags since some distros bury panel.h
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
-+#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
- 
- termcontrol="none";
- 

+ 0 - 11
package/kismet/patches/patch-ifcontrol_cc

@@ -1,11 +0,0 @@
---- kismet-2010-01-R1.orig/ifcontrol.cc	Mon Aug 31 01:36:19 2009
-+++ kismet-2010-01-R1/ifcontrol.cc	Wed Feb 17 21:59:02 2010
-@@ -149,7 +149,7 @@ string Linux_GetSysDrv(const char *in_dev) {
- 	devlinklen = readlink(devlink.c_str(), devlinktarget, 511);
- 	if (devlinklen > 0) {
- 		devlinktarget[devlinklen] = '\0';
--		rind = rindex(devlinktarget, '/');
-+		rind = strchr(devlinktarget, '/');
- 		// If we found it and not at the end of the line
- 		if (rind != NULL && (rind - devlinktarget) + 1 < devlinklen)
- 			return string(rind + 1);

+ 0 - 37
package/kismet/patches/patch-iwcontrol_cc

@@ -1,37 +0,0 @@
---- kismet-2010-01-R1.orig/iwcontrol.cc	Mon Aug 17 21:51:36 2009
-+++ kismet-2010-01-R1/iwcontrol.cc	Wed Feb 17 21:59:02 2010
-@@ -32,7 +32,6 @@
- #include <linux/if.h>
- #include <linux/wireless.h>
- 
--#endif // wireless
- 
- #ifndef rintf
- #define rintf(x) (float) rint((double) (x))
-@@ -697,7 +696,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char 
- 		return -1;
- 	}
- 
--	bzero(buffer, sizeof(buffer));
-+	memset(buffer, 0, sizeof(buffer));
- 
- 	memset(&wrq, 0, sizeof(struct iwreq));
- 
-@@ -732,7 +731,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char 
- 		memcpy((char *) &range, buffer, sizeof(iw_range));
- 	} else {
- 		/* Zero unknown fields */
--		bzero((char *) &range, sizeof(struct iw_range));
-+		memset((char *) &range, 0, sizeof(struct iw_range));
- 
- 		/* Initial part unmoved */
- 		memcpy((char *) &range, buffer, iwr15_off(num_channels));
-@@ -797,6 +796,8 @@ int Iwconfig_Get_Chanlist(const char *interface, char 
- 	close(skfd);
- 	return chan_list->size();
- }
-+
-+#endif // wireless
- 
- #endif
- 

+ 2 - 0
package/lynx/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		ncurses openssl zlib
 PKG_URL:=		http://lynx.isc.org/
 PKG_SITES:=		http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/
 
+PKG_NOPARALLEL:=	1
+
 DISTFILES=		${PKG_NAME}${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/lynx2-8-7
 

+ 1 - 0
package/olsrd/Makefile

@@ -12,6 +12,7 @@ PKG_SECTION:=		wifi
 PKG_URL:=		http://www.olsr.org/
 PKG_SITES:=		http://www.olsr.org/releases/0.6/
 PKG_MULTI:=		1
+PKG_NOPARALLEL:=	1
 
 PKG_SUBPKGS:=		OLSRD OLSRD_MOD_DYN_GW OLSRD_MOD_HTTPINFO OLSRD_MOD_NAMESERVICE
 PKG_SUBPKGS+=		OLSRD_MOD_TAS

+ 1 - 0
package/ppp/Makefile

@@ -33,6 +33,7 @@ $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_
 CONFIG_STYLE:=		minimal
 CONFIGURE_ARGS+=	--system=Linux
 CONFIGURE_ENV+=		UNAME_S="Linux"
+TARGET_LDFLAGS+=	-lcrypt
 XAKE_FLAGS+=		STAGING_TARGET_DIR=${STAGING_TARGET_DIR} \
 			DESTDIR="${WRKINST}/usr" STRIP='' \
 			TARGET_AR='${TARGET_CROSS}ar'

+ 1 - 0
package/tzdata/Makefile

@@ -32,6 +32,7 @@ $(eval $(call PKG_template,ZIC,zic,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},
 $(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
+CFLAGS_FOR_BUILD+=	-DSTD_INSPIRED=1
 XAKE_FLAGS+=		TOPDIR="${WRKINST}" TZDIR="${WRKINST}/usr/share/zoneinfo" cc="${TARGET_CC}"
 # the uppercase targets enable building and installation of the date utility
 ALL_TARGET:=		ALL

+ 1 - 0
package/weechat/Makefile

@@ -23,6 +23,7 @@ CONFIGURE_ARGS+=	--with-debug=0 \
 			--disable-perl \
 			--disable-python \
 			--disable-lua \
+			--disable-tcl \
 			--disable-gnutls \
 			--disable-ruby \
 			--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr'

+ 1 - 0
package/xf86-video-geode/Makefile

@@ -13,6 +13,7 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_ARCH_DEPENDS:=	x86
 PKG_CFLINE_XF86_VIDEO_GEODE:=	depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk