Browse Source

make MacOS X works as build system for most of the packages, update some packages to latest stable upstream version

Waldemar Brodkorb 13 years ago
parent
commit
838ba34414

+ 11 - 0
package/MesaLib/patches/patch-bin_mklib

@@ -0,0 +1,11 @@
+--- Mesa-7.8.2.orig/bin/mklib	2010-06-15 19:43:41.000000000 +0200
++++ Mesa-7.8.2/bin/mklib	2010-10-11 20:40:45.000000000 +0200
+@@ -251,7 +251,7 @@ OBJECTS=$@
+ 
+ 
+ if [ ${ARCH} = "auto" ] ; then
+-    ARCH=`uname`
++    ARCH=Linux
+ fi
+ 
+ 

+ 10 - 0
package/flex/patches/patch-Makefile_in

@@ -0,0 +1,10 @@
+--- flex-2.5.35.orig/Makefile.in	2008-02-26 22:34:10.000000000 +0100
++++ flex-2.5.35/Makefile.in	2010-10-04 23:21:19.000000000 +0200
+@@ -483,7 +483,6 @@ libfl.a: $(libfl_a_OBJECTS) $(libfl_a_DE
+ libfl_pic.a: $(libfl_pic_a_OBJECTS) $(libfl_pic_a_DEPENDENCIES) 
+ 	-rm -f libfl_pic.a
+ 	$(libfl_pic_a_AR) libfl_pic.a $(libfl_pic_a_OBJECTS) $(libfl_pic_a_LIBADD)
+-	$(RANLIB) libfl_pic.a
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"

+ 20 - 0
package/flex/patches/patch-conf_in

@@ -0,0 +1,20 @@
+--- flex-2.5.35.orig/conf.in	2008-02-26 22:34:02.000000000 +0100
++++ flex-2.5.35/conf.in	2010-10-04 23:18:48.000000000 +0200
+@@ -162,7 +162,7 @@
+ 
+ /* If using the C implementation of alloca, define if you know the
+    direction of stack growth for your system; otherwise it will be
+-   automatically deduced at run-time.
++   automatically deduced at runtime.
+ 	STACK_DIRECTION > 0 => grows toward higher addresses
+ 	STACK_DIRECTION < 0 => grows toward lower addresses
+ 	STACK_DIRECTION = 0 => direction of growth unknown */
+@@ -190,7 +190,7 @@
+ /* Define to rpl_realloc if the replacement function should be used. */
+ #undef realloc
+ 
+-/* Define to `unsigned' if <sys/types.h> does not define. */
++/* Define to `unsigned int' if <sys/types.h> does not define. */
+ #undef size_t
+ 
+ /* Define as `fork' if `vfork' does not work. */

+ 19 - 0
package/ipcad/patches/patch-headers_h

@@ -0,0 +1,19 @@
+--- ipcad-3.7.3.orig/headers.h	2007-04-22 10:08:45.000000000 +0200
++++ ipcad-3.7.3/headers.h	2010-10-06 22:27:28.000000000 +0200
+@@ -28,6 +28,8 @@
+ #ifndef	__HEADERS_H__
+ #define	__HEADERS_H__
+ 
++#include <signal.h>
++
+ #ifndef	__need_sig_atomic_t
+ #define	__need_sig_atomic_t	1
+ #endif
+@@ -143,7 +145,6 @@
+ #endif
+ 
+ #include <poll.h>
+-#include <signal.h>
+ #include <fnmatch.h>
+ 
+ #include <assert.h>

+ 11 - 0
package/libcapi20/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- libcapi20-3.0.5-cm.orig/Makefile.in	2008-02-16 17:00:08.000000000 +0100
++++ libcapi20-3.0.5-cm/Makefile.in	2010-10-06 23:28:41.000000000 +0200
+@@ -361,7 +361,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
++	test -z "$(DESTDIR)$(includedir)" || mkdir -p "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \

+ 11 - 0
package/libtasn1/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- libtasn1-2.2.orig/Makefile.in	2009-05-20 12:03:47.000000000 +0200
++++ libtasn1-2.2/Makefile.in	2010-10-05 22:41:43.000000000 +0200
+@@ -446,7 +446,7 @@ EXTRA_DIST = windows/asn1-parser/asn1-pa
+ 	windows/libtasn1/libtasn1.vcproj \
+ 	windows/test-parser/test-parser.vcproj \
+ 	windows/test-tree/test-tree.vcproj cfg.mk maint.mk .clcopying
+-SUBDIRS = gl lib src examples tests doc
++SUBDIRS = gl lib src examples tests
+ ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/glm4
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

+ 16 - 0
package/lsof/patches/patch-dialects_linux_dlsof_h

@@ -0,0 +1,16 @@
+--- lsof_4.84_src.orig/dialects/linux/dlsof.h	2010-01-18 20:03:19.000000000 +0100
++++ lsof_4.84_src/dialects/linux/dlsof.h	2010-10-07 20:35:57.000000000 +0200
+@@ -49,13 +49,7 @@
+ #include <setjmp.h>
+ #include <unistd.h>
+ #include <netinet/in.h>
+-
+-# if	defined(GLIBCV) || defined(__UCLIBC__)
+ #include <netinet/tcp.h>
+-# else	/* !defined(GLIBCV) && !defined(__UCLIBC__) */
+-#include <linux/tcp.h>
+-# endif	/* defined(GLIBCV) || defined(__UCLIBC__) */
+-
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_prot.h>
+  

+ 88 - 0
package/monit/patches/patch-configure

@@ -0,0 +1,88 @@
+--- monit-5.2.1.orig/configure	2010-09-24 21:46:55.000000000 +0200
++++ monit-5.2.1/configure	2010-10-08 23:36:24.000000000 +0200
+@@ -10961,82 +10961,14 @@ fi
+ # Architecture/OS detection
+ # ------------------------------------------------------------------------
+ 
+-# Backward compatibility until we get ride of arch settings
+-if test `uname` = "SunOS"
+-then
+-   ARCH="SOLARIS"
+-   CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+-   test_kstat="true"
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CPU_WAIT 1
+-_ACEOF
+-
+-elif test `uname` = "Linux"
+-then
+-   ARCH="LINUX"
+-   CFLAGS="$CFLAGS -D _REENTRANT"
+-   LDFLAGS="$LDFLAGS -rdynamic"
+-   if test `uname -r | awk -F '.' '{print$1$2}'` -ge "26"
+-   then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CPU_WAIT 1
+-_ACEOF
+-
+-   fi
+-elif test `uname` = "HP-UX"
+-then
+-   ARCH="HPUX"
+-   CFLAGS="$CFLAGS -D _REENTRANT"
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CPU_WAIT 1
+-_ACEOF
+-
+-elif test `uname` = "OpenBSD"
+-then
+-   ARCH="OPENBSD"
+-   CFLAGS="$CFLAGS -D _REENTRANT"
+-   test_kvm="true"
+-elif test `uname` = "FreeBSD"
+-then
+-   ARCH="FREEBSD"
+-   CFLAGS="$CFLAGS -D _REENTRANT"
+-   test_kvm="true"
+-elif test `uname` = "NetBSD"
+-then
+-   ARCH="NETBSD"
+-   CFLAGS="$CFLAGS -D _REENTRANT"
+-   test_kvm="true"
+-elif test `uname` = "Darwin"
+-then
+-   ARCH="DARWIN"
+-   CFLAGS="$CFLAGS -DREENTRANT -no-cpp-precomp -DNEED_SOCKLEN_T_DEFINED"
+-   test_kvm="true"
+-   LIBS="$LIBS -framework System -multiply_defined suppress"
+-elif test `uname` = "AIX"
+-then
+-   ARCH="AIX"
+-   CFLAGS="$CFLAGS -D _REENTRANT"
+-   LIBS="$LIBS -lodm"
+-   # AIX v. 5.2
+-   LIBS="$LIBS -lcfg"
+-   # AIX v. 5.3
+-   LIBS="$LIBS -lperfstat"
++ARCH="LINUX"
++CFLAGS="$CFLAGS -D _REENTRANT"
++LDFLAGS="$LDFLAGS -rdynamic"
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CPU_WAIT 1
+ _ACEOF
+ 
+-else
+-   { $as_echo "$as_me:$LINENO: WARNING: Architecture not supported: \`uname\`." >&5
+-$as_echo "$as_me: WARNING: Architecture not supported: \`uname\`." >&2;}
+-   CFLAGS="$CFLAGS -D _REENTRANT"
+-   ARCH="UNKNOWN"
+-fi
+-
+-
+ # ------------------------------------------------------------------------
+ # Resource code
+ # ------------------------------------------------------------------------

+ 31 - 0
package/neon/patches/patch-configure

@@ -0,0 +1,31 @@
+--- neon-0.29.4.orig/configure	2010-10-01 14:35:24.000000000 +0200
++++ neon-0.29.4/configure	2010-10-03 01:29:52.000000000 +0200
+@@ -4249,28 +4249,6 @@ _ACEOF
+ fi
+ 
+ 
+-# Check for Darwin, which needs extra cpp and linker flags.
+-{ $as_echo "$as_me:$LINENO: checking for uname" >&5
+-$as_echo_n "checking for uname... " >&6; }
+-if test "${ne_cv_os_uname+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-
+- ne_cv_os_uname=`uname -s 2>/dev/null`
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ne_cv_os_uname" >&5
+-$as_echo "$ne_cv_os_uname" >&6; }
+-
+-if test "$ne_cv_os_uname" = "Darwin"; then
+-  CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
+-  LDFLAGS="$LDFLAGS -flat_namespace"
+-  # poll has various issues in various Darwin releases
+-  if test x${ac_cv_func_poll+set} != xset; then
+-    ac_cv_func_poll=no
+-  fi
+-fi
+-
+ { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}

+ 2 - 20
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk

@@ -1,5 +1,5 @@
---- nss-3.12.6.orig/mozilla/security/coreconf/Linux.mk	2010-01-15 23:19:00.000000000 +0100
-+++ nss-3.12.6/mozilla/security/coreconf/Linux.mk	2010-04-12 20:18:32.000000000 +0200
+--- nss-3.12.8.orig/mozilla/security/coreconf/Linux.mk	2010-08-13 03:32:29.000000000 +0200
++++ nss-3.12.8/mozilla/security/coreconf/Linux.mk	2010-10-12 13:46:39.000000000 +0200
 @@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
  	IMPL_STRATEGY = _PTH
  endif
@@ -13,21 +13,3 @@
  
  DEFAULT_COMPILER = gcc
  
-@@ -133,7 +133,7 @@ endif
- # not build with -ansi.
- STANDARDS_CFLAGS	= -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
- OS_CFLAGS		= $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
--OS_LIBS			= $(OS_PTHREAD) -ldl -lc
-+OS_LIBS			= $(OS_PTHREAD)
- 
- ifdef USE_PTHREADS
- 	DEFINES		+= -D_REENTRANT
-@@ -148,7 +148,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG)
- # we don't use -z defs there.
- ZDEFS_FLAG		= -Wl,-z,defs
- DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
--LDFLAGS			+= $(ARCHFLAG)
-+#LDFLAGS			+= $(ARCHFLAG)
- 
- # INCLUDES += -I/usr/include -Y/usr/include/linux
- G++INCLUDES		= -I/usr/include/g++

+ 11 - 0
package/nss/patches/patch-mozilla_security_coreconf_command_mk

@@ -0,0 +1,11 @@
+--- nss-3.12.8.orig/mozilla/security/coreconf/command.mk	2007-10-23 23:55:00.000000000 +0200
++++ nss-3.12.8/mozilla/security/coreconf/command.mk	2010-10-12 14:44:35.000000000 +0200
+@@ -48,7 +48,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
+ CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+ 		$(XCFLAGS)
+ PERL          = perl
+-RANLIB        = echo
++RANLIB        = ranlib
+ TAR           = /bin/tar
+ #
+ # For purify

+ 20 - 0
package/nss/patches/patch-mozilla_security_coreconf_rules_mk

@@ -0,0 +1,20 @@
+--- nss-3.12.8.orig/mozilla/security/coreconf/rules.mk	2010-04-26 01:37:40.000000000 +0200
++++ nss-3.12.8/mozilla/security/coreconf/rules.mk	2010-10-03 23:41:05.000000000 +0200
+@@ -281,7 +281,7 @@ ifdef MT
+ 	fi
+ endif	# MSVC with manifest tool
+ else
+-	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ endif
+ 
+ get_objs:
+@@ -338,7 +338,7 @@ ifdef MT
+ endif	# MSVC with manifest tool
+ endif
+ else
+-	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKSHLIB) -o $@ $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ 	chmod +x $@
+ ifeq ($(OS_TARGET),Darwin)
+ ifdef MAPFILE

+ 11 - 0
package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c

@@ -0,0 +1,11 @@
+--- nss-3.12.8.orig/mozilla/security/nss/lib/freebl/stubs.c	2010-04-29 02:17:52.000000000 +0200
++++ nss-3.12.8/mozilla/security/nss/lib/freebl/stubs.c	2010-10-03 23:19:08.000000000 +0200
+@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib)
+  * fetch the library if it's loaded. For NSS it should already be loaded
+  */
+ #define freebl_getLibrary(libName)  \
+-    dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
++    dlopen (libName, RTLD_LAZY)
+ 
+ #define freebl_releaseLibrary(lib) \
+     if (lib) dlclose(lib)

+ 13 - 0
package/olsrd/patches/patch-src_unix_ifnet_c

@@ -0,0 +1,13 @@
+--- olsrd-0.6.0.orig/src/unix/ifnet.c	2010-04-22 17:11:11.000000000 +0200
++++ olsrd-0.6.0/src/unix/ifnet.c	2010-10-10 14:34:54.000000000 +0200
+@@ -547,10 +547,8 @@ chk_if_up(struct olsr_if *iface, int deb
+   struct ifreq ifr;
+   union olsr_ip_addr null_addr;
+   size_t name_size;
+-#ifdef linux
+   int precedence = IPTOS_PREC(olsr_cnf->tos);
+   int tos_bits = IPTOS_TOS(olsr_cnf->tos);
+-#endif
+ 
+   if (iface->host_emul)
+     return -1;

+ 4 - 2
package/pciutils/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pciutils
-PKG_VERSION:=		3.0.3
+PKG_VERSION:=		3.1.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d07da501bb11e6af40acd036536c2e9a
+PKG_MD5SUM:=		f3e349d22a3714b4272b171649ad5235
 PKG_DESCR:=		PCI Utilities
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		zlib
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.kernel.org/pub/software/utils/pciutils/
 PKG_SITES:=		http://www.kernel.org/pub/software/utils/pciutils/
 
+PKG_HOST_DEPENDS:=	!darwin
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PCIUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 11 - 0
package/pciutils/patches/patch-Makefile

@@ -0,0 +1,11 @@
+--- pciutils-3.1.7.orig/Makefile	2010-01-31 18:42:12.000000000 +0100
++++ pciutils-3.1.7/Makefile	2010-10-10 20:15:01.000000000 +0200
+@@ -52,7 +52,7 @@ PCIINC_INS=lib/config.h lib/header.h lib
+ 
+ export
+ 
+-all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
++all: lib/$(PCILIB) lspci setpci lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
+ 
+ lib/$(PCILIB): $(PCIINC) force
+ 	$(MAKE) -C lib all

+ 3 - 3
package/pciutils/patches/patch-lib_configure

@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- pciutils-3.0.3.orig/lib/configure	2008-11-09 20:50:26.000000000 +0100
-+++ pciutils-3.0.3/lib/configure	2009-01-09 19:56:33.000000000 +0100
-@@ -60,7 +60,6 @@ case $sys in
+--- pciutils-3.1.7.orig/lib/configure	2009-07-04 18:11:04.000000000 +0200
++++ pciutils-3.1.7/lib/configure	2010-10-10 20:14:17.000000000 +0200
+@@ -64,7 +64,6 @@ case $sys in
  		echo_n " sysfs proc"
  		echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
  		echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'

+ 28 - 0
package/traceroute/patches/patch-Make_rules

@@ -0,0 +1,28 @@
+--- traceroute-2.0.16.orig/Make.rules	2010-09-09 16:20:46.000000000 +0200
++++ traceroute-2.0.16/Make.rules	2010-10-11 20:07:03.000000000 +0200
+@@ -46,14 +46,14 @@ $(call set, INSTALL, cp)
+ $(call set, INDENT, true)
+ 
+ gcc = $(findstring gcc,$(CC))
+-$(call set, CFLAGS, $(if $(gcc), -O2 -Wall, -O))
++$(call set, CFLAGS, )
+ $(call set, CPPFLAGS, )
+ $(call set, LDFLAGS, -s)
+ $(call set, LIBS, )
+ 
+ 
+ #  install stuff
+-prefix = /usr/local
++prefix = /usr
+ 
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+@@ -125,7 +125,7 @@ _libs = $(strip $(foreach lib,$(LIBDIRS)
+ 			$(wildcard $(srcdir)/$(lib)/$(lib).so \
+ 					$(srcdir)/$(lib)/$(lib).a))))
+ 
+-override LIBS := $(_libs) -lm $(LIBS)
++override LIBS := $(_libs) $(LIBS)
+ 
+ ifneq ($(gcc),)
+ CPATH = $(subst $(empty) ,:,$(includes))

+ 12 - 0
toolchain/eglibc/patches/ip_h_bug.patch

@@ -0,0 +1,12 @@
+diff -Nur eglibc-2.12.orig/libc/sysdeps/generic/netinet/ip.h eglibc-2.12/libc/sysdeps/generic/netinet/ip.h
+--- eglibc-2.12.orig/libc/sysdeps/generic/netinet/ip.h	2010-09-28 19:13:14.000000000 +0200
++++ eglibc-2.12/libc/sysdeps/generic/netinet/ip.h	2010-10-10 14:41:32.000000000 +0200
+@@ -194,7 +194,7 @@
+  */
+ 
+ #define	IPTOS_CLASS_MASK		0xe0
+-#define	IPTOS_CLASS(class)		((tos) & IPTOS_CLASS_MASK)
++#define	IPTOS_CLASS(class)		((class) & IPTOS_CLASS_MASK)
+ #define	IPTOS_CLASS_CS0			0x00
+ #define	IPTOS_CLASS_CS1			0x20
+ #define	IPTOS_CLASS_CS2			0x40

+ 12 - 0
toolchain/glibc/patches/ip_h-bug.patch

@@ -0,0 +1,12 @@
+diff -Nur glibc-2.12.1.orig/sysdeps/generic/netinet/ip.h glibc-2.12.1/sysdeps/generic/netinet/ip.h
+--- glibc-2.12.1.orig/sysdeps/generic/netinet/ip.h	2010-07-27 13:34:39.000000000 +0200
++++ glibc-2.12.1/sysdeps/generic/netinet/ip.h	2010-10-13 15:00:56.000000000 +0200
+@@ -194,7 +194,7 @@
+  */
+ 
+ #define	IPTOS_CLASS_MASK		0xe0
+-#define	IPTOS_CLASS(class)		((tos) & IPTOS_CLASS_MASK)
++#define	IPTOS_CLASS(class)		((class) & IPTOS_CLASS_MASK)
+ #define	IPTOS_CLASS_CS0			0x00
+ #define	IPTOS_CLASS_CS1			0x20
+ #define	IPTOS_CLASS_CS2			0x40