diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 20:20:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 20:20:57 +0200 |
| commit | e2454e75ec1ee4aa50af8e96838c3feb53904d08 (patch) | |
| tree | 5a05596c49e3e1533236c478434e79660c5345b0 | |
| parent | ee19c86dc8f3d69e9082d45d2824a18710311ecb (diff) | |
| parent | 76acdb984750a027ddc2fc899e5a15d95251bb49 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
45 files changed, 459 insertions, 1034 deletions
diff --git a/package/bison/Makefile b/package/bison/Makefile index b3642d177..bf058fc9a 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bison -PKG_VERSION:= 2.4.1 +PKG_VERSION:= 2.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= c58aa1da418dc9704070872489e89bf5 +PKG_MD5SUM:= 6fc502f135738e98fecf1e5c8de38d62 PKG_DESCR:= GNU parser generator PKG_SECTION:= lang -PKG_URL:= http://www.gnu.org/software/bison +PKG_URL:= http://www.gnu.org/software/bison/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} include ${TOPDIR}/mk/package.mk diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in index 19d01c699..7f757fb29 100644 --- a/package/bison/patches/patch-Makefile_in +++ b/package/bison/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- bison-2.4.1.orig/Makefile.in 2008-12-11 23:05:53.000000000 +0100 -+++ bison-2.4.1/Makefile.in 2010-02-23 20:11:17.748535777 +0100 -@@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@ +--- bison-2.4.2.orig/Makefile.in 2010-03-20 18:14:08.000000000 +0100 ++++ bison-2.4.2/Makefile.in 2010-07-30 17:11:16.198057000 +0200 +@@ -871,7 +871,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc +SUBDIRS = build-aux po runtime-po lib data src etc aclocal_DATA = m4/bison-i18n.m4 - EXTRA_DIST = .prev-version .version cfg.mk maint.mk \ + EXTRA_DIST = .prev-version .version cfg.mk \ OChangeLog PACKAGING \ diff --git a/package/bison/patches/patch-lib_config_hin b/package/bison/patches/patch-lib_config_hin deleted file mode 100644 index dde4f8ee0..000000000 --- a/package/bison/patches/patch-lib_config_hin +++ /dev/null @@ -1,12 +0,0 @@ ---- bison-2.4.1.orig/lib/config.hin 2008-12-11 23:05:52.000000000 +0100 -+++ bison-2.4.1/lib/config.hin 2010-02-23 20:09:49.477285615 +0100 -@@ -399,6 +399,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - diff --git a/package/bison/patches/patch-lib_spawn_in_h b/package/bison/patches/patch-lib_spawn_in_h new file mode 100644 index 000000000..a32d9eb93 --- /dev/null +++ b/package/bison/patches/patch-lib_spawn_in_h @@ -0,0 +1,18 @@ +--- bison-2.4.2.orig/lib/spawn.in.h 2010-03-17 20:17:04.000000000 +0100 ++++ bison-2.4.2/lib/spawn.in.h 2010-07-30 17:23:46.000000000 +0200 +@@ -29,13 +29,8 @@ + #ifndef _GL_SPAWN_H + #define _GL_SPAWN_H + +-/* Get definitions of 'struct sched_param' and 'sigset_t'. +- But avoid namespace pollution on glibc systems. */ +-#ifndef __GLIBC__ +-# include <sched.h> +-# include <signal.h> +-#endif +- ++#include <sched.h> ++#include <signal.h> + #include <sys/types.h> + + #ifndef __THROW diff --git a/package/bison/patches/patch-src_Makefile_in b/package/bison/patches/patch-src_Makefile_in new file mode 100644 index 000000000..0a1b9c247 --- /dev/null +++ b/package/bison/patches/patch-src_Makefile_in @@ -0,0 +1,11 @@ +--- bison-2.4.2.orig/src/Makefile.in 2010-03-20 18:14:10.000000000 +0100 ++++ bison-2.4.2/src/Makefile.in 2010-07-30 17:28:09.000000000 +0200 +@@ -1313,7 +1313,7 @@ uninstall-am: uninstall-binPROGRAMS unin + + yacc: + echo '#! /bin/sh' >$@ +- echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@ ++ echo "exec bison -y "'"$$@"' >>$@ + chmod a+x $@ + + echo: diff --git a/package/chillispot/patches/patch-Makefile b/package/chillispot/patches/patch-Makefile deleted file mode 100644 index e951e5931..000000000 --- a/package/chillispot/patches/patch-Makefile +++ /dev/null @@ -1,178 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- chillispot-1.1.0.orig/Makefile 2006-09-24 21:35:16.000000000 +0200 -+++ chillispot-1.1.0/Makefile 2009-05-21 20:42:08.000000000 +0200 -@@ -13,9 +13,9 @@ - # PARTICULAR PURPOSE. - - --srcdir = . --top_srcdir = . -- -+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 - pkgdatadir = $(datadir)/chillispot - pkglibdir = $(libdir)/chillispot - pkgincludedir = $(includedir)/chillispot -@@ -33,8 +33,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = i686-pc-linux-gnu --host_triplet = i686-pc-linux-gnu -+build_triplet = x86_64-pc-linux-gnu -+host_triplet = i586-pc-linux-gnu - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/chillispot.spec.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ -@@ -72,24 +72,24 @@ DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print --ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 --AMDEP_FALSE = # --AMDEP_TRUE = --AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar --AR = ar --AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf --AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader --AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 -+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 -+AMDEP_FALSE = -+AMDEP_TRUE = # -+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar -+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar -+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf -+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader -+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 - AWK = gawk --CC = gcc --CCDEPMODE = depmode=gcc3 --CFLAGS = -g -O2 --CPP = gcc -E --CPPFLAGS = --CXX = g++ --CXXCPP = g++ -E --CXXDEPMODE = depmode=gcc3 --CXXFLAGS = -g -O2 -+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -+CCDEPMODE = depmode=none -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E -+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG -+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E -+CXXDEPMODE = depmode=none -+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer - CYGPATH_W = echo - DEFS = -DHAVE_CONFIG_H - DEPDIR = .deps -@@ -99,19 +99,19 @@ ECHO_N = -n - ECHO_T = - EGREP = grep -E - EXEEXT = --F77 = f95 --FFLAGS = -g -O2 -+F77 = -+FFLAGS = - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_PROGRAM = ${INSTALL} - INSTALL_SCRIPT = ${INSTALL} - INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s --LDFLAGS = --LIBOBJS = -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib -+LIBOBJS = memcmp$U.o - LIBS = - LIBTOOL = $(SHELL) $(top_builddir)/libtool - LN_S = ln -s --LTLIBOBJS = --MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo -+LTLIBOBJS = memcmp$U.lo -+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo - OBJEXT = o - PACKAGE = chillispot - PACKAGE_BUGREPORT = bugs@chillispot.org -@@ -120,54 +120,54 @@ PACKAGE_STRING = chillispot 1.1.0 - PACKAGE_TARNAME = chillispot - PACKAGE_VERSION = 1.1.0 - PATH_SEPARATOR = : --RANLIB = ranlib -+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib - SET_MAKE = --SHELL = /bin/sh --STRIP = strip -+SHELL = /bin/bash -+STRIP = i586-linux-strip - VERSION = 1.1.0 --ac_ct_AR = ar --ac_ct_CC = gcc --ac_ct_CXX = g++ --ac_ct_F77 = f95 --ac_ct_RANLIB = ranlib --ac_ct_STRIP = strip --am__fastdepCC_FALSE = # --am__fastdepCC_TRUE = --am__fastdepCXX_FALSE = # --am__fastdepCXX_TRUE = -+ac_ct_AR = -+ac_ct_CC = -+ac_ct_CXX = -+ac_ct_F77 = -+ac_ct_RANLIB = -+ac_ct_STRIP = -+am__fastdepCC_FALSE = -+am__fastdepCC_TRUE = # -+am__fastdepCXX_FALSE = -+am__fastdepCXX_TRUE = # - am__include = include - am__leading_dot = . - am__quote = - am__tar = ${AMTAR} chof - "$$tardir" - am__untar = ${AMTAR} xf - - bindir = ${exec_prefix}/bin --build = i686-pc-linux-gnu --build_alias = --build_cpu = i686 -+build = x86_64-pc-linux-gnu -+build_alias = x86_64-linux-gnu -+build_cpu = x86_64 - build_os = linux-gnu - build_vendor = pc --datadir = ${prefix}/share -+datadir = /usr/share - exec_prefix = ${prefix} --host = i686-pc-linux-gnu --host_alias = --host_cpu = i686 -+host = i586-pc-linux-gnu -+host_alias = i586-linux -+host_cpu = i586 - host_os = linux-gnu - host_vendor = pc - includedir = ${prefix}/include - infodir = ${prefix}/info --install_sh = /home/jj/chillispot/install-sh -+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh - libdir = ${exec_prefix}/lib --libexecdir = ${exec_prefix}/libexec --localstatedir = ${prefix}/var --mandir = ${prefix}/man -+libexecdir = /usr/sbin -+localstatedir = /var -+mandir = /usr/share/man - mkdir_p = mkdir -p -- - oldincludedir = /usr/include --prefix = /usr/local --program_transform_name = s,x,x, -+prefix = /usr -+program_transform_name = s,$$,,;s,^,, - sbindir = ${exec_prefix}/sbin - sharedstatedir = ${prefix}/com --sysconfdir = ${prefix}/etc --target_alias = -+sysconfdir = /etc -+target_alias = i586-linux - SUBDIRS = src doc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/package/chillispot/patches/patch-doc_Makefile b/package/chillispot/patches/patch-doc_Makefile deleted file mode 100644 index a6290fc41..000000000 --- a/package/chillispot/patches/patch-doc_Makefile +++ /dev/null @@ -1,178 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- chillispot-1.1.0.orig/doc/Makefile 2006-09-24 21:35:16.000000000 +0200 -+++ chillispot-1.1.0/doc/Makefile 2009-05-21 20:42:08.000000000 +0200 -@@ -13,9 +13,9 @@ - # PARTICULAR PURPOSE. - - --srcdir = . --top_srcdir = .. -- -+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc -+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc - pkgdatadir = $(datadir)/chillispot - pkglibdir = $(libdir)/chillispot - pkgincludedir = $(includedir)/chillispot -@@ -33,8 +33,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = i686-pc-linux-gnu --host_triplet = i686-pc-linux-gnu -+build_triplet = x86_64-pc-linux-gnu -+host_triplet = i586-pc-linux-gnu - subdir = doc - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -51,24 +51,24 @@ am__installdirs = "$(DESTDIR)$(man8dir)" - NROFF = nroff - MANS = $(man_MANS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 --AMDEP_FALSE = # --AMDEP_TRUE = --AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar --AR = ar --AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf --AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader --AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 -+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 -+AMDEP_FALSE = -+AMDEP_TRUE = # -+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar -+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar -+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf -+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader -+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 - AWK = gawk --CC = gcc --CCDEPMODE = depmode=gcc3 --CFLAGS = -g -O2 --CPP = gcc -E --CPPFLAGS = --CXX = g++ --CXXCPP = g++ -E --CXXDEPMODE = depmode=gcc3 --CXXFLAGS = -g -O2 -+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -+CCDEPMODE = depmode=none -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E -+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG -+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E -+CXXDEPMODE = depmode=none -+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer - CYGPATH_W = echo - DEFS = -DHAVE_CONFIG_H - DEPDIR = .deps -@@ -78,19 +78,19 @@ ECHO_N = -n - ECHO_T = - EGREP = grep -E - EXEEXT = --F77 = f95 --FFLAGS = -g -O2 -+F77 = -+FFLAGS = - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_PROGRAM = ${INSTALL} - INSTALL_SCRIPT = ${INSTALL} - INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s --LDFLAGS = --LIBOBJS = -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib -+LIBOBJS = memcmp$U.o - LIBS = - LIBTOOL = $(SHELL) $(top_builddir)/libtool - LN_S = ln -s --LTLIBOBJS = --MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo -+LTLIBOBJS = memcmp$U.lo -+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo - OBJEXT = o - PACKAGE = chillispot - PACKAGE_BUGREPORT = bugs@chillispot.org -@@ -99,54 +99,54 @@ PACKAGE_STRING = chillispot 1.1.0 - PACKAGE_TARNAME = chillispot - PACKAGE_VERSION = 1.1.0 - PATH_SEPARATOR = : --RANLIB = ranlib -+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib - SET_MAKE = --SHELL = /bin/sh --STRIP = strip -+SHELL = /bin/bash -+STRIP = i586-linux-strip - VERSION = 1.1.0 --ac_ct_AR = ar --ac_ct_CC = gcc --ac_ct_CXX = g++ --ac_ct_F77 = f95 --ac_ct_RANLIB = ranlib --ac_ct_STRIP = strip --am__fastdepCC_FALSE = # --am__fastdepCC_TRUE = --am__fastdepCXX_FALSE = # --am__fastdepCXX_TRUE = -+ac_ct_AR = -+ac_ct_CC = -+ac_ct_CXX = -+ac_ct_F77 = -+ac_ct_RANLIB = -+ac_ct_STRIP = -+am__fastdepCC_FALSE = -+am__fastdepCC_TRUE = # -+am__fastdepCXX_FALSE = -+am__fastdepCXX_TRUE = # - am__include = include - am__leading_dot = . - am__quote = - am__tar = ${AMTAR} chof - "$$tardir" - am__untar = ${AMTAR} xf - - bindir = ${exec_prefix}/bin --build = i686-pc-linux-gnu --build_alias = --build_cpu = i686 -+build = x86_64-pc-linux-gnu -+build_alias = x86_64-linux-gnu -+build_cpu = x86_64 - build_os = linux-gnu - build_vendor = pc --datadir = ${prefix}/share -+datadir = /usr/share - exec_prefix = ${prefix} --host = i686-pc-linux-gnu --host_alias = --host_cpu = i686 -+host = i586-pc-linux-gnu -+host_alias = i586-linux -+host_cpu = i586 - host_os = linux-gnu - host_vendor = pc - includedir = ${prefix}/include - infodir = ${prefix}/info --install_sh = /home/jj/chillispot/install-sh -+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh - libdir = ${exec_prefix}/lib --libexecdir = ${exec_prefix}/libexec --localstatedir = ${prefix}/var --mandir = ${prefix}/man -+libexecdir = /usr/sbin -+localstatedir = /var -+mandir = /usr/share/man - mkdir_p = mkdir -p -- - oldincludedir = /usr/include --prefix = /usr/local --program_transform_name = s,x,x, -+prefix = /usr -+program_transform_name = s,$$,,;s,^,, - sbindir = ${exec_prefix}/sbin - sharedstatedir = ${prefix}/com --sysconfdir = ${prefix}/etc --target_alias = -+sysconfdir = /etc -+target_alias = i586-linux - man_MANS = chilli.8 - man_aux = $(man_MANS:.1=.x) - EXTRA_DIST = $(man_MANS) diff --git a/package/chillispot/patches/patch-src_Makefile b/package/chillispot/patches/patch-src_Makefile deleted file mode 100644 index 975e6623e..000000000 --- a/package/chillispot/patches/patch-src_Makefile +++ /dev/null @@ -1,243 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- chillispot-1.1.0.orig/src/Makefile 2006-09-24 21:35:16.000000000 +0200 -+++ chillispot-1.1.0/src/Makefile 2009-05-21 20:42:08.000000000 +0200 -@@ -16,9 +16,9 @@ - - SOURCES = $(chilli_SOURCES) - --srcdir = . --top_srcdir = .. -- -+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src -+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src - pkgdatadir = $(datadir)/chillispot - pkglibdir = $(libdir)/chillispot - pkgincludedir = $(includedir)/chillispot -@@ -36,8 +36,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = i686-pc-linux-gnu --host_triplet = i686-pc-linux-gnu -+build_triplet = x86_64-pc-linux-gnu -+host_triplet = i586-pc-linux-gnu - sbin_PROGRAMS = chilli$(EXEEXT) - subdir = src - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES) - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 --AMDEP_FALSE = # --AMDEP_TRUE = --AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar --AR = ar --AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf --AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader --AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 -+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 -+AMDEP_FALSE = -+AMDEP_TRUE = # -+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar -+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar -+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf -+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader -+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 - AWK = gawk --CC = gcc --CCDEPMODE = depmode=gcc3 --CFLAGS = -g -O2 --CPP = gcc -E --CPPFLAGS = --CXX = g++ --CXXCPP = g++ -E --CXXDEPMODE = depmode=gcc3 --CXXFLAGS = -g -O2 -+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -+CCDEPMODE = depmode=none -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E -+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG -+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E -+CXXDEPMODE = depmode=none -+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer - CYGPATH_W = echo - DEFS = -DHAVE_CONFIG_H - DEPDIR = .deps -@@ -100,19 +100,19 @@ ECHO_N = -n - ECHO_T = - EGREP = grep -E - EXEEXT = --F77 = f95 --FFLAGS = -g -O2 -+F77 = -+FFLAGS = - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_PROGRAM = ${INSTALL} - INSTALL_SCRIPT = ${INSTALL} - INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s --LDFLAGS = --LIBOBJS = -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib -+LIBOBJS = memcmp$U.o - LIBS = - LIBTOOL = $(SHELL) $(top_builddir)/libtool - LN_S = ln -s --LTLIBOBJS = --MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo -+LTLIBOBJS = memcmp$U.lo -+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo - OBJEXT = o - PACKAGE = chillispot - PACKAGE_BUGREPORT = bugs@chillispot.org -@@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0 - PACKAGE_TARNAME = chillispot - PACKAGE_VERSION = 1.1.0 - PATH_SEPARATOR = : --RANLIB = ranlib -+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib - SET_MAKE = --SHELL = /bin/sh --STRIP = strip -+SHELL = /bin/bash -+STRIP = i586-linux-strip - VERSION = 1.1.0 --ac_ct_AR = ar --ac_ct_CC = gcc --ac_ct_CXX = g++ --ac_ct_F77 = f95 --ac_ct_RANLIB = ranlib --ac_ct_STRIP = strip --am__fastdepCC_FALSE = # --am__fastdepCC_TRUE = --am__fastdepCXX_FALSE = # --am__fastdepCXX_TRUE = -+ac_ct_AR = -+ac_ct_CC = -+ac_ct_CXX = -+ac_ct_F77 = -+ac_ct_RANLIB = -+ac_ct_STRIP = -+am__fastdepCC_FALSE = -+am__fastdepCC_TRUE = # -+am__fastdepCXX_FALSE = -+am__fastdepCXX_TRUE = # - am__include = include - am__leading_dot = . - am__quote = - am__tar = ${AMTAR} chof - "$$tardir" - am__untar = ${AMTAR} xf - - bindir = ${exec_prefix}/bin --build = i686-pc-linux-gnu --build_alias = --build_cpu = i686 -+build = x86_64-pc-linux-gnu -+build_alias = x86_64-linux-gnu -+build_cpu = x86_64 - build_os = linux-gnu - build_vendor = pc --datadir = ${prefix}/share -+datadir = /usr/share - exec_prefix = ${prefix} --host = i686-pc-linux-gnu --host_alias = --host_cpu = i686 -+host = i586-pc-linux-gnu -+host_alias = i586-linux -+host_cpu = i586 - host_os = linux-gnu - host_vendor = pc - includedir = ${prefix}/include - infodir = ${prefix}/info --install_sh = /home/jj/chillispot/install-sh -+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh - libdir = ${exec_prefix}/lib --libexecdir = ${exec_prefix}/libexec --localstatedir = ${prefix}/var --mandir = ${prefix}/man -+libexecdir = /usr/sbin -+localstatedir = /var -+mandir = /usr/share/man - mkdir_p = mkdir -p -- - oldincludedir = /usr/include --prefix = /usr/local --program_transform_name = s,x,x, -+prefix = /usr -+program_transform_name = s,$$,,;s,^,, - sbindir = ${exec_prefix}/sbin - sharedstatedir = ${prefix}/com --sysconfdir = ${prefix}/etc --target_alias = -+sysconfdir = /etc -+target_alias = i586-linux - - # add -pg to enable gprof - AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' -@@ -244,38 +244,38 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --include ./$(DEPDIR)/chilli.Po --include ./$(DEPDIR)/cmdline.Po --include ./$(DEPDIR)/dhcp.Po --include ./$(DEPDIR)/iphash.Po --include ./$(DEPDIR)/ippool.Po --include ./$(DEPDIR)/lookup.Po --include ./$(DEPDIR)/md5.Po --include ./$(DEPDIR)/radius.Po --include ./$(DEPDIR)/redir.Po --include ./$(DEPDIR)/syserr.Po --include ./$(DEPDIR)/tun.Po -+#include ./$(DEPDIR)/chilli.Po -+#include ./$(DEPDIR)/cmdline.Po -+#include ./$(DEPDIR)/dhcp.Po -+#include ./$(DEPDIR)/iphash.Po -+#include ./$(DEPDIR)/ippool.Po -+#include ./$(DEPDIR)/lookup.Po -+#include ./$(DEPDIR)/md5.Po -+#include ./$(DEPDIR)/radius.Po -+#include ./$(DEPDIR)/redir.Po -+#include ./$(DEPDIR)/syserr.Po -+#include ./$(DEPDIR)/tun.Po - - .c.o: -- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --# source='$<' object='$@' libtool=no \ --# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ --# $(COMPILE) -c $< -+# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+# source='$<' object='$@' libtool=no -+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) -+ $(COMPILE) -c $< - - .c.obj: -- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --# source='$<' object='$@' libtool=no \ --# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ --# $(COMPILE) -c `$(CYGPATH_W) '$<'` -+# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+# source='$<' object='$@' libtool=no -+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) -+ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: -- if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --# source='$<' object='$@' libtool=yes \ --# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ --# $(LTCOMPILE) -c -o $@ $< -+# if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+# source='$<' object='$@' libtool=yes -+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) -+ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo diff --git a/package/cxxtools/patches/patch-Makefile_in b/package/cxxtools/patches/patch-Makefile_in deleted file mode 100644 index d0936ae5d..000000000 --- a/package/cxxtools/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- cxxtools-1.4.8.orig/Makefile.in 2008-05-26 19:51:34.000000000 +0200 -+++ cxxtools-1.4.8/Makefile.in 2009-11-19 22:10:18.000000000 +0100 -@@ -200,7 +200,7 @@ subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src include demo -+SUBDIRS = src include - bin_SCRIPTS = cxxtools-config - EXTRA_dist = \ - m4/acx_pthread.m4 \ diff --git a/package/cxxtools/patches/patch-demo_Makefile_in b/package/cxxtools/patches/patch-demo_Makefile_in deleted file mode 100644 index 0fcb3bca3..000000000 --- a/package/cxxtools/patches/patch-demo_Makefile_in +++ /dev/null @@ -1,67 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cxxtools-1.4.8.orig/demo/Makefile.in 2008-05-26 19:51:34.000000000 +0200 -+++ cxxtools-1.4.8/demo/Makefile.in 2009-04-28 22:29:02.476545131 +0200 -@@ -40,7 +40,7 @@ host_triplet = @host@ - noinst_PROGRAMS = arg$(EXEEXT) arg-set$(EXEEXT) cgi$(EXEEXT) \ - dir$(EXEEXT) dlloader$(EXEEXT) dynbuffer$(EXEEXT) \ - getini$(EXEEXT) hd$(EXEEXT) httprequest$(EXEEXT) \ -- iconv$(EXEEXT) log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \ -+ log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \ - md5sum$(EXEEXT) mime$(EXEEXT) multifstream$(EXEEXT) \ - netcat$(EXEEXT) netio$(EXEEXT) netmsg$(EXEEXT) \ - pipestream$(EXEEXT) pool$(EXEEXT) signals$(EXEEXT) \ -@@ -96,10 +96,6 @@ am_httprequest_OBJECTS = httprequest.$(O - httprequest_OBJECTS = $(am_httprequest_OBJECTS) - httprequest_LDADD = $(LDADD) - httprequest_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la --am_iconv_OBJECTS = iconv.$(OBJEXT) --iconv_OBJECTS = $(am_iconv_OBJECTS) --iconv_LDADD = $(LDADD) --iconv_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la - am_log_OBJECTS = log.$(OBJEXT) - log_OBJECTS = $(am_log_OBJECTS) - log_LDADD = $(LDADD) -@@ -170,7 +166,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX --mode=li - SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \ - $(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \ - $(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \ -- $(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \ -+ $(httprequest_SOURCES) $(log_SOURCES) \ - $(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \ - $(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \ - $(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \ -@@ -179,7 +175,7 @@ SOURCES = $(arg_SOURCES) $(arg_set_SOURC - DIST_SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \ - $(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \ - $(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \ -- $(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \ -+ $(httprequest_SOURCES) $(log_SOURCES) \ - $(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \ - $(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \ - $(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \ -@@ -319,7 +315,6 @@ dynbuffer_SOURCES = dynbuffer.cpp - getini_SOURCES = getini.cpp - hd_SOURCES = hd.cpp - httprequest_SOURCES = httprequest.cpp --iconv_SOURCES = iconv.cpp - log_SOURCES = log.cpp - logbench_SOURCES = logbench.cpp - logsh_SOURCES = logsh.cpp -@@ -415,9 +410,6 @@ hd$(EXEEXT): $(hd_OBJECTS) $(hd_DEPENDEN - httprequest$(EXEEXT): $(httprequest_OBJECTS) $(httprequest_DEPENDENCIES) - @rm -f httprequest$(EXEEXT) - $(CXXLINK) $(httprequest_LDFLAGS) $(httprequest_OBJECTS) $(httprequest_LDADD) $(LIBS) --iconv$(EXEEXT): $(iconv_OBJECTS) $(iconv_DEPENDENCIES) -- @rm -f iconv$(EXEEXT) -- $(CXXLINK) $(iconv_LDFLAGS) $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS) - log$(EXEEXT): $(log_OBJECTS) $(log_DEPENDENCIES) - @rm -f log$(EXEEXT) - $(CXXLINK) $(log_LDFLAGS) $(log_OBJECTS) $(log_LDADD) $(LIBS) -@@ -477,7 +469,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getini.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httprequest.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logbench.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logsh.Po@am__quote@ diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 59f0ac281..5f39f9c79 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -17,6 +17,7 @@ PKG_SITES:= http://www.dillo.org/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin include $(TOPDIR)/mk/package.mk diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 234386e9c..54e62d6b1 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -21,6 +21,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote +PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin include $(TOPDIR)/mk/package.mk @@ -44,6 +45,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-system-png \ --with-system-nss \ --with-system-nspr \ + --with-libIDL-prefix=${STAGING_DIR}/usr \ + --with-glib-prefix=${STAGING_DIR}/usr \ --enable-libxul \ --disable-tests \ --disable-static \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index f424b3787..28035c66a 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,6 +1,15 @@ ---- mozilla-1.9.2.orig/configure 2010-04-02 18:07:41.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-04-11 14:38:39.000000000 +0200 -@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then +--- mozilla-1.9.2.orig/configure 2010-07-23 00:00:19.000000000 +0200 ++++ mozilla-1.9.2/configure 2010-07-30 09:52:43.000000000 +0200 +@@ -3970,7 +3970,7 @@ else + echo "$ac_t""yes" 1>&6 + fi + +- for ac_prog in $PYTHON python2.5 python2.4 python ++ for ac_prog in $PYTHON python2.6 python2.5 python2.4 python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index 6d5bdb921..a3585b620 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -13,6 +13,7 @@ PKG_BUILDDEP+= MesaLib PKG_URL:= http://freeglut.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/} +PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin include $(TOPDIR)/mk/package.mk diff --git a/package/git/Makefile b/package/git/Makefile index a3c9a8fd6..162cc13ab 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.7.1 +PKG_VERSION:= 1.7.2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= d2fefae2b787a19601c09d89975ce5fb +PKG_MD5SUM:= 13fc44363df744a401552e73e5476351 PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_DEPENDS:= libopenssl libcurl libexpat libpthread @@ -18,8 +18,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ +MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \ CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR} XAKE_FLAGS+= uname_S=Linux uname_O=GNU/Linux CONFIGURE_ENV+= ac_cv_c_c99_format=yes \ diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile index 6f3b70e98..dcfd4dd82 100644 --- a/package/git/patches/patch-Makefile +++ b/package/git/patches/patch-Makefile @@ -1,26 +1,6 @@ ---- git-1.6.5.5.orig/Makefile 2009-12-06 04:51:25.000000000 +0100 -+++ git-1.6.5.5/Makefile 2009-12-07 20:13:40.753866786 +0100 -@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de - - # CFLAGS and LDFLAGS are for the users to override from the command line. - --CFLAGS = -g -O2 -Wall --LDFLAGS = -+CFLAGS ?= -g -O2 -Wall -+LDFLAGS ?= - ALL_CFLAGS = $(CFLAGS) - ALL_LDFLAGS = $(LDFLAGS) - STRIP ?= strip -@@ -241,7 +241,7 @@ bindir_relative = bin - bindir = $(prefix)/$(bindir_relative) - mandir = share/man - infodir = share/info --gitexecdir = libexec/git-core -+gitexecdir = sbin/git-core - sharedir = $(prefix)/share - template_dir = share/git-core/templates - htmldir = share/doc/git-doc -@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm +--- git-1.7.2.1.orig/Makefile 2010-07-28 19:03:43.000000000 +0200 ++++ git-1.7.2.1/Makefile 2010-07-30 12:25:52.000000000 +0200 +@@ -1594,7 +1594,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP $(BUILT_INS): git$X $(QUIET_BUILT_IN)$(RM) $@ && \ @@ -28,11 +8,31 @@ ln -s git$X $@ 2>/dev/null || \ cp git$X $@ -@@ -1749,7 +1748,6 @@ endif +@@ -1894,7 +1893,6 @@ git-http-push$X: revision.o http.o http- + + $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) + $(QUIET_LNCP)$(RM) $@ && \ +- ln $< $@ 2>/dev/null || \ + ln -s $< $@ 2>/dev/null || \ + cp $< $@ + +@@ -2077,18 +2075,16 @@ endif + { test "$$bindir/" = "$$execdir/" || \ + { $(RM) "$$execdir/git$X" && \ + test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ +- ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ ++ ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ - { for p in $(BUILT_INS); do \ + for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ - done; } && \ + done && \ + remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \ + for p in $$remote_curl_aliases; do \ + $(RM) "$$execdir/$$p" && \ +- ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \ + done && \ diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index a1ce89161..174690c7b 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd -PKG_VERSION:= 2.92 +PKG_VERSION:= 2.95 PKG_RELEASE:= 1 -PKG_MD5SUM:= 50b60d9f6dd51e001f4dfbaeb825c988 +PKG_MD5SUM:= 12535a9ed9fecf9ea2c5bdc9840da5ae PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= misc PKG_DEPENDS:= libpthread @@ -15,12 +15,12 @@ PKG_CXX:= GPSD PKG_SITES:= http://download.berlios.de/gpsd/ PKG_URL:= http://gpsd.berlios.de/ -PKG_DESCR_1:= GPS client utilities +PKG_DESCR_CLIENTS:= GPS client utilities include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENTS},${PKG_SECTION})) CONFIGURE_ENV+= EGREP="grep -E" \ CPP="$(TARGET_CC) -E" \ @@ -41,7 +41,7 @@ TLDFLAGS+= -shared -pthread endif post-extract: - @find ${WRKBUILD} -name *.rej -exec rm {} \; + #@find ${WRKBUILD} -name *.rej -exec rm {} \; ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ @@ -52,7 +52,7 @@ endif post-install: ${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin - ${CP} ${WRKINST}/usr/lib/libgps.so.* ${IDIR_GPSD}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgps.so* ${IDIR_GPSD}/usr/lib ${CP} ${WRKINST}/usr/sbin/gpsd ${IDIR_GPSD}/usr/sbin ${INSTALL_DIR} ${IDIR_GPSD_CLIENTS}/usr/bin ${CP} ${WRKINST}/usr/bin/{cgps,gpxlogger} \ diff --git a/package/gpsd/patches/patch-Makefile_in b/package/gpsd/patches/patch-Makefile_in index fe57b879b..bd45358ee 100644 --- a/package/gpsd/patches/patch-Makefile_in +++ b/package/gpsd/patches/patch-Makefile_in @@ -1,44 +1,13 @@ ---- gpsd-2.92.orig/Makefile.in 2010-03-03 14:49:11.000000000 +0100 -+++ gpsd-2.92/Makefile.in 2010-04-03 10:33:48.782836143 +0200 -@@ -615,8 +615,6 @@ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIB - # - # Build Python binding - # --@HAVE_PYTHON_TRUE@PYEXTENSIONS = gpspacket.so gpslib.so --@HAVE_PYTHON_TRUE@noinst_SCRIPTS = gpspacket.so gpslib.so setup.py - @LIBGPSMM_ENABLE_FALSE@TESTBINS = test_float test_trig test_bits test_packet test_geoid \ - @LIBGPSMM_ENABLE_FALSE@ test_mkgmtime test_json +--- gpsd-2.95.orig/Makefile.in 2010-07-14 00:48:24.000000000 +0200 ++++ gpsd-2.95/Makefile.in 2010-07-30 13:04:19.000000000 +0200 +@@ -612,8 +612,8 @@ libgps_la_SOURCES = $(libgps_c_sources) + libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \ + driver_rtcm2.h packet_states.h -@@ -1946,32 +1944,6 @@ maskdump.c: gpsd.h-tail maskaudit.py - $(PYTHON) maskaudit.py -c >maskdump.c && \ - chmod a-w maskdump.c - --# Multiple-outputs hack. See --# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs --@HAVE_PYTHON_TRUE@$(PYEXTENSIONS): stamp-python-modules --@HAVE_PYTHON_TRUE@ +@WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED) --# TODO: Should the dependency on libgps.la be enforced inside --# setup.py? (See the variable 'needed_files' in setup.py.) --@HAVE_PYTHON_TRUE@stamp-python-modules: gpspacket.c gpsclient.c libgps.la setup.py --@HAVE_PYTHON_TRUE@ @rm -f '$@' '$@.tmp' --@HAVE_PYTHON_TRUE@ @echo 'timestamp for $@' > '$@.tmp' --@HAVE_PYTHON_TRUE@ (cd '$(srcdir)' && \ --@HAVE_PYTHON_TRUE@ env abs_builddir='$(abs_builddir)' \ --@HAVE_PYTHON_TRUE@ MAKE='$(MAKE)' \ --@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py build_ext \ --@HAVE_PYTHON_TRUE@ --build-lib '$(srcdir)' \ --@HAVE_PYTHON_TRUE@ --build-temp '$(srcdir)/build' \ --@HAVE_PYTHON_TRUE@ --include-dirs '$(srcdir):.'\ --@HAVE_PYTHON_TRUE@ --mangenerator '$(MANGENERATOR)') && \ --@HAVE_PYTHON_TRUE@ mv -f '$@.tmp' '$@' -- --# Clean up after Python --@HAVE_PYTHON_TRUE@clean-local: --@HAVE_PYTHON_TRUE@ rm -rf build -- --# Install Python modules --@HAVE_PYTHON_TRUE@install-exec-local: --@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR) - - @HAVE_XSLT_PROCESSOR_TRUE@.xml.1: - @HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $< +-@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@ +-@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@ ++@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = $(SHELL) ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@ ++@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = $(SHELL) ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@ + nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i + libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) + libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la diff --git a/package/gpsd/patches/patch-driver_sirf_c b/package/gpsd/patches/patch-driver_sirf_c new file mode 100644 index 000000000..058978636 --- /dev/null +++ b/package/gpsd/patches/patch-driver_sirf_c @@ -0,0 +1,11 @@ +--- gpsd-2.95.orig/driver_sirf.c 2010-06-11 10:38:24.000000000 +0200 ++++ gpsd-2.95/driver_sirf.c 2010-07-30 12:53:40.000000000 +0200 +@@ -325,7 +325,7 @@ static gps_mask_t sirf_msg_debug(unsigne + char msgbuf[MAX_PACKET_LENGTH * 3 + 2]; + int i; + +- bzero(msgbuf, (int)sizeof(msgbuf)); ++ memset(msgbuf, 0, (int)sizeof(msgbuf)); + + /*@ +charint @*/ + if (0xe1 == buf[0]) { /* Development statistics messages */ diff --git a/package/gpsd/patches/patch-gps_1 b/package/gpsd/patches/patch-gps_1 deleted file mode 100644 index 23b1b8763..000000000 --- a/package/gpsd/patches/patch-gps_1 +++ /dev/null @@ -1,17 +0,0 @@ ---- gpsd-2.92.orig/gps.1 2010-03-01 06:00:44.000000000 +0100 -+++ gpsd-2.92/gps.1 2010-04-03 10:22:50.111390920 +0200 -@@ -2,12 +2,12 @@ - .\" Title: gps - .\" Author: [see the "AUTHORS" section] - .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/> --.\" Date: 03/01/2010 -+.\" Date: 04/03/2010 - .\" Manual: [FIXME: manual] - .\" Source: [FIXME: source] - .\" Language: English - .\" --.TH "GPS" "1" "03/01/2010" "[FIXME: source]" "[FIXME: manual]" -+.TH "GPS" "1" "04/03/2010" "[FIXME: source]" "[FIXME: manual]" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- diff --git a/package/gpsd/patches/patch-gpsd_config_h b/package/gpsd/patches/patch-gpsd_config_h deleted file mode 100644 index dbc0c7b12..000000000 --- a/package/gpsd/patches/patch-gpsd_config_h +++ /dev/null @@ -1,42 +0,0 @@ ---- gpsd-2.92.orig/gpsd_config.h 2010-03-03 01:58:01.000000000 +0100 -+++ gpsd-2.92/gpsd_config.h 2010-04-03 10:22:22.423474030 +0200 -@@ -117,7 +117,7 @@ - #define HAVE_PYTHON_H 1 - - /* Define to 1 if you have the `round' function. */ --/* #undef HAVE_ROUND */ -+#define HAVE_ROUND 1 - - /* Define to 1 if you have the `setlocale' function. */ - #define HAVE_SETLOCALE 1 -@@ -141,7 +141,7 @@ - /* #undef HAVE_STRLCPY */ - - /* Define to 1 if you have the `strtonum' function. */ --/* #undef HAVE_STRTONUM */ -+#define HAVE_STRTONUM 1 - - /* Define to 1 if `struct tm' is a member of `tm_zone'. */ - #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -206,10 +206,10 @@ - #define HAVE_VSNPRINTF 1 - - /* Define to 1 if you have the <X11/xpm.h> header file. */ --#define HAVE_X11_XPM_H 1 -+/* #undef HAVE_X11_XPM_H */ - - /* Xpm available */ --#define HAVE_XPM 1 -+/* #undef HAVE_XPM */ - - /* Define to 1 if you have the <xpm.h> header file. */ - /* #undef HAVE_XPM_H */ -@@ -309,7 +309,7 @@ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --#define SIZEOF_LONG 8 -+#define SIZEOF_LONG 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 diff --git a/package/gpsd/patches/patch-gpsd_h b/package/gpsd/patches/patch-gpsd_h deleted file mode 100644 index 86912eac7..000000000 --- a/package/gpsd/patches/patch-gpsd_h +++ /dev/null @@ -1,42 +0,0 @@ ---- gpsd-2.92.orig/gpsd.h 2010-03-03 01:58:01.000000000 +0100 -+++ gpsd-2.92/gpsd.h 2010-04-03 10:22:22.793473137 +0200 -@@ -137,7 +137,7 @@ - #define HAVE_PYTHON_H 1 - - /* Define to 1 if you have the `round' function. */ --/* #undef HAVE_ROUND */ -+#define HAVE_ROUND 1 - - /* Define to 1 if you have the `setlocale' function. */ - #define HAVE_SETLOCALE 1 -@@ -161,7 +161,7 @@ - /* #undef HAVE_STRLCPY */ - - /* Define to 1 if you have the `strtonum' function. */ --/* #undef HAVE_STRTONUM */ -+#define HAVE_STRTONUM 1 - - /* Define to 1 if `struct tm' is a member of `tm_zone'. */ - #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -226,10 +226,10 @@ - #define HAVE_VSNPRINTF 1 - - /* Define to 1 if you have the <X11/xpm.h> header file. */ --#define HAVE_X11_XPM_H 1 -+/* #undef HAVE_X11_XPM_H */ - - /* Xpm available */ --#define HAVE_XPM 1 -+/* #undef HAVE_XPM */ - - /* Define to 1 if you have the <xpm.h> header file. */ - /* #undef HAVE_XPM_H */ -@@ -329,7 +329,7 @@ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --#define SIZEOF_LONG 8 -+#define SIZEOF_LONG 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 diff --git a/package/gpsd/patches/patch-gpspipe_c b/package/gpsd/patches/patch-gpspipe_c new file mode 100644 index 000000000..2afd83621 --- /dev/null +++ b/package/gpsd/patches/patch-gpspipe_c @@ -0,0 +1,11 @@ +--- gpsd-2.95.orig/gpspipe.c 2010-06-11 11:21:42.000000000 +0200 ++++ gpsd-2.95/gpspipe.c 2010-07-30 12:54:08.000000000 +0200 +@@ -120,7 +120,7 @@ static void open_serial(char *device) + } + + /* Clear struct for new port settings. */ +- /*@i@*/ bzero(&newtio, sizeof(newtio)); ++ /*@i@*/ memset(&newtio, 0, sizeof(newtio)); + + /* make it raw */ + (void)cfmakeraw(&newtio); diff --git a/package/gpsd/patches/patch-revision_h b/package/gpsd/patches/patch-revision_h deleted file mode 100644 index 98151f235..000000000 --- a/package/gpsd/patches/patch-revision_h +++ /dev/null @@ -1,5 +0,0 @@ ---- gpsd-2.92.orig/revision.h 2010-03-03 14:49:28.000000000 +0100 -+++ gpsd-2.92/revision.h 2010-04-03 10:22:22.843473239 +0200 -@@ -1 +1 @@ --#define REVISION "svn7020" -+#define REVISION "svnexported" diff --git a/package/libmpc/Makefile b/package/libmpc/Makefile index ef82baa7c..5343ae4a4 100644 --- a/package/libmpc/Makefile +++ b/package/libmpc/Makefile @@ -7,6 +7,7 @@ include ${TOPDIR}/toolchain/mpc/Makefile.inc PKG_DESCR:= GNU multiprecision arithmetic library PKG_SECTION:= libs PKG_URL:= http://www.multiprecision.org/ +PKG_BUILDDEP+= gmp mpfr include ${TOPDIR}/mk/package.mk diff --git a/package/libtool/Makefile b/package/libtool/Makefile index d043decca..dbf2e3c05 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtool -PKG_VERSION:= 2.2.8 +PKG_VERSION:= 2.2.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= cad2a7188242bc8dbab0645532ae3d6f +PKG_MD5SUM:= b745d220e88163fcd9eea0a90ccf21b0 PKG_DESCR:= a generic dynamic object loading library PKG_SECTION:= lang PKG_URL:= http://www.gnu.org/software/libtool diff --git a/package/lsof/Makefile b/package/lsof/Makefile index d0b5f292c..3b41b8f48 100644 --- a/package/lsof/Makefile +++ b/package/lsof/Makefile @@ -19,9 +19,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_PROG:= Configure CONFIG_STYLE:= minimal -CONFIGURE_ARGS+= -n linux +CONFIGURE_PROG:= Configure +CONFIGURE_ARGS:= -n linux XAKE_FLAGS+= CC='${TARGET_CC}' INSTALL_STYLE:= manual diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 06e53c8d2..c7d2a4ee6 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.62 +PKG_VERSION:= 2.02.72 PKG_RELEASE:= 1 -PKG_MD5SUM:= 72e3d66dc42aaf67dca475196a113528 +PKG_MD5SUM:= a7d0d1235a589869bd13cde0f0d7375d PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in deleted file mode 100644 index fd15b0060..000000000 --- a/package/lvm/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- LVM2.2.02.61.orig/Makefile.in 2009-10-02 21:10:31.000000000 +0200 -+++ LVM2.2.02.61/Makefile.in 2010-03-03 19:43:58.976123551 +0100 -@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@ - top_builddir = @top_builddir@ - VPATH = @srcdir@ - --SUBDIRS = doc include man scripts -+SUBDIRS = include - - ifeq ("@UDEV_RULES@", "yes") - SUBDIRS += udev -@@ -64,7 +64,7 @@ po: tools daemons - libdm.device-mapper: include.device-mapper - daemons.device-mapper: libdm.device-mapper - tools.device-mapper: libdm.device-mapper --device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper -+device-mapper: tools.device-mapper daemons.device-mapper - - ifeq ("@INTL@", "yes") - lib.pofile: include.pofile diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in new file mode 100644 index 000000000..0f5ca59fc --- /dev/null +++ b/package/lvm/patches/patch-doc_Makefile_in @@ -0,0 +1,14 @@ +--- LVM2.2.02.72.orig/doc/Makefile.in Thu May 20 13:45:57 2010 ++++ LVM2.2.02.72/doc/Makefile.in Fri Jul 30 09:23:26 2010 +@@ -22,8 +22,9 @@ include $(top_builddir)/make.tmpl + + install_lvm2: $(CONFSRC) + @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ +- echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \ +- $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \ ++ echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST)"; \ ++ $(INSTALL_DIR) $(confdir); \ ++ $(INSTALL_WDATA) $< $(confdir)/$(CONFDEST); \ + fi + + install: install_lvm2 diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 52a52a0fd..9a999133b 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,60 +1,51 @@ ---- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200 -+++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100 -@@ -35,9 +35,7 @@ SOURCES =\ +--- LVM2.2.02.72.orig/libdm/Makefile.in Fri Jun 25 20:17:39 2010 ++++ LVM2.2.02.72/libdm/Makefile.in Fri Jul 30 10:34:15 2010 +@@ -34,10 +34,7 @@ SOURCES =\ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) -ifeq ("@STATIC_LINK@", "yes") LIB_STATIC = $(interface)/libdevmapper.a -endif - - ifeq ("@LIB_SUFFIX@","dylib") - LIB_SHARED = $(interface)/libdevmapper.dylib -@@ -60,9 +58,7 @@ device-mapper: all +- + LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) + LIB_VERSION = $(LIB_VERSION_DM) + TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) +@@ -65,11 +62,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX). + install_pkgconfig INSTALL_TYPE = install_dynamic ++INSTALL_TYPE += install_static -ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static -endif -+INSTALL_TYPE += install_static - +- ifeq ("@PKGCONFIG@", "yes") INSTALL_TYPE += install_pkgconfig -@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include + endif +@@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install - install_include: -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ -+ $(INSTALL) -d $(includedir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ - $(includedir)/libdevmapper.h + install_include: $(srcdir)/libdevmapper.h +- $(INSTALL_DATA) -D $< $(includedir)/$(<F) ++ $(INSTALL_DIR) $(includedir) ++ $(INSTALL_DATA) $< $(includedir)/$(<F) install_dynamic: install_@interface@ -+ $(INSTALL) -d $(libdir) - $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \ - $(libdir)/libdevmapper.$(LIB_SUFFIX) - - install_static: install_@interface@_static -+ $(INSTALL) -d $(libdir) - $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a - - install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX) -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ - $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) - - install_pkgconfig: -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \ -+ $(INSTALL) -d $(usrlibdir)/pkgconfig -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.pc \ - $(usrlibdir)/pkgconfig/devmapper.pc - - install_ioctl_static: ioctl/libdevmapper.a -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ - $(libdir)/libdevmapper.a.$(LIB_VERSION_DM) - - $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX) + +@@ -88,10 +83,12 @@ install_static: install_@interface@_static + install_ioctl: install_lib_shared + + install_pkgconfig: libdevmapper.pc +- $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc ++ $(INSTALL_DIR) $(pkgconfigdir) ++ $(INSTALL_DATA) $< $(pkgconfigdir)/devmapper.pc + + install_ioctl_static: $(LIB_STATIC) +- $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) ++ $(INSTALL_DIR) $(usrlibdir) ++ $(INSTALL_DATA) $< $(usrlibdir)/$(<F) + + CLEAN_TARGETS += ioctl/libdevmapper.a + DISTCLEAN_TARGETS += libdevmapper.pc diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in new file mode 100644 index 000000000..7ffbb36b5 --- /dev/null +++ b/package/lvm/patches/patch-make_tmpl_in @@ -0,0 +1,28 @@ +--- LVM2.2.02.72.orig/make.tmpl.in Tue Jul 20 16:38:44 2010 ++++ LVM2.2.02.72/make.tmpl.in Fri Jul 30 10:22:54 2010 +@@ -312,7 +312,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) + $(LN_S) -f $(<F) $@ + + install_lib_shared: $(LIB_SHARED) +- $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION) ++ $(INSTALL_DIR) $(libdir) ++ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION) + $(INSTALL_DIR) $(usrlibdir) + $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) + +@@ -320,11 +321,13 @@ install_lib_shared: $(LIB_SHARED) + # and for compatibility links in libdir are created + # when the code is fixed links could be removed. + install_dm_plugin: $(LIB_SHARED) +- $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F) ++ $(INSTALL_DIR) $(libdir) ++ $(INSTALL_PROGRAM) $< $(libdir)/device-mapper/$(<F) + $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F) + + install_lvm2_plugin: $(LIB_SHARED) +- $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F) ++ $(INSTALL_DIR) $(libdir) ++ $(INSTALL_PROGRAM) $< $(libdir)/lvm2/$(<F) + $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F) + $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION) + endif diff --git a/package/lvm/patches/patch-scripts_Makefile_in b/package/lvm/patches/patch-scripts_Makefile_in new file mode 100644 index 000000000..1886a1930 --- /dev/null +++ b/package/lvm/patches/patch-scripts_Makefile_in @@ -0,0 +1,12 @@ +--- LVM2.2.02.72.orig/scripts/Makefile.in Thu May 20 16:45:17 2010 ++++ LVM2.2.02.72/scripts/Makefile.in Fri Jul 30 09:26:25 2010 +@@ -25,7 +25,8 @@ endif + vpath %.sh $(srcdir) + + %_install: %.sh +- $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F)) ++ $(INSTALL_DIR) $(sbindir) ++ $(INSTALL_PROGRAM) $< $(sbindir)/$(basename $(<F)) + + install_lvm2: $(SCRIPTS:.sh=_install) + diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in index ae6fcbf8f..81b1efc97 100644 --- a/package/lvm/patches/patch-tools_Makefile_in +++ b/package/lvm/patches/patch-tools_Makefile_in @@ -1,55 +1,58 @@ ---- LVM2.2.02.61.orig/tools/Makefile.in 2010-01-19 02:10:47.000000000 +0100 -+++ LVM2.2.02.61/tools/Makefile.in 2010-03-03 19:46:06.396138753 +0100 -@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r - endif +--- LVM2.2.02.72.orig/tools/Makefile.in Fri Jun 25 20:23:10 2010 ++++ LVM2.2.02.72/tools/Makefile.in Fri Jul 30 10:13:24 2010 +@@ -157,7 +157,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$( + + .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile + $(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \ +- egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands ++ egrep -v '^ *(#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands + + ifneq ("$(CFLOW_CMD)", "") + CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) +@@ -170,18 +170,22 @@ endif + install_dmsetup_dynamic install_dmsetup_static + + install_cmdlib_include: $(srcdir)/lvm2cmd.h +- $(INSTALL_DATA) -D $< $(includedir)/$(<F) ++ $(INSTALL_DIR) $(includedir) ++ $(INSTALL_DATA) $< $(includedir)/$(<F) install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX) -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ - $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) - $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX) -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ -+ $(INSTALL) -d $(includedir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ - $(includedir)/lvm2cmd.h +- $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION) ++ $(INSTALL_DIR) $(libdir) ++ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION) + $(INSTALL_DIR) $(usrlibdir) + $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) install_cmdlib_static: liblvm2cmd-static.a -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ - $(libdir)/liblvm2cmd.a.$(LIB_VERSION) - $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ -+ $(INSTALL) -d $(includedir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ - $(includedir)/lvm2cmd.h +- $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a ++ $(INSTALL_DIR) $(usrlibdir) ++ $(INSTALL_DATA) $< $(usrlibdir)/liblvm2cmd.a install_tools_dynamic: lvm .commands -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \ -+ $(INSTALL) -d $(sbindir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \ - $(sbindir)/lvm +- $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm ++ $(INSTALL_DIR) $(sbindir) ++ $(INSTALL_PROGRAM) lvm $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) - @( \ -@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands - ) + @for v in `cat .commands`; do \ + echo "$(LN_S) -f lvm $(sbindir)/$$v"; \ +@@ -189,13 +193,16 @@ install_tools_dynamic: lvm .commands + done; install_tools_static: lvm.static -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -d $(sbindir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ - $(staticdir)/lvm.static +- $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) ++ $(INSTALL_DIR) $(staticdir) ++ $(INSTALL_PROGRAM) $< $(staticdir)/$(<F) install_dmsetup_dynamic: dmsetup -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< -+ $(INSTALL) -d $(sbindir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< +- $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) ++ $(INSTALL_DIR) $(sbindir) ++ $(INSTALL_PROGRAM) $< $(sbindir)/$(<F) install_dmsetup_static: dmsetup.static -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< -+ $(INSTALL) -d $(sbindir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< +- $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) ++ $(INSTALL_DIR) $(staticdir) ++ $(INSTALL_PROGRAM) $< $(staticdir)/$(<F) install_device-mapper: $(INSTALL_DMSETUP_TARGETS) diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 0c9e3945c..7b516a989 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.0-31648 -PKG_RELEASE:= 3 -PKG_MD5SUM:= eeb9219f9015e0e0dfbf4a70efefb751 +PKG_VERSION:= 1.0-31868 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 9d5c2c1c927947b31afa6f42c11e8f23 PKG_DESCR:= popular video player PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses @@ -86,6 +86,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --target=${ARCH}-linux \ --cc=$(TARGET_CC) \ --host-cc=$(HOSTCC) \ + --yasm='' \ --disable-mencoder \ --enable-fbdev \ --enable-alsa \ diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index 1c61d1a01..aad04ff2b 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,53 @@ --- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200 -+++ mysql-5.1.48/configure 2010-07-12 22:51:24.267118950 +0200 -@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann ++++ mysql-5.1.48/configure 2010-07-30 11:04:50.000000000 +0200 +@@ -19825,45 +19825,7 @@ fi + $as_echo_n "checking \"how to check if pid exists\"... " >&6; } + PS=$ac_cv_path_PS + # Linux style +-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null +-then +- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +-# Solaris +-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +-# BSD style +-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +-# SysV style +-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +-# Do anybody use this? +-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +-else +- case $SYSTEM_TYPE in +- *freebsd*|*dragonfly*) +- FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +- ;; +- *darwin*) +- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +- ;; +- *cygwin*) +- FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +- ;; +- *netware*) +- FIND_PROC= +- ;; +- *) +- { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&5 +-$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&2;} +- { (exit 1); exit 1; }; } +- esac +-fi ++FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + + { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 + $as_echo "\"$FIND_PROC\"" >&6; } +@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann esac @@ -198,7 +245,7 @@ { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; } -@@ -48581,101 +48398,6 @@ fi +@@ -48581,101 +48360,6 @@ fi done diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile index 313c2bb84..cb1f0e162 100644 --- a/package/pcmciautils/patches/patch-Makefile +++ b/package/pcmciautils/patches/patch-Makefile @@ -1,5 +1,5 @@ --- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100 -+++ pcmciautils-017/Makefile 2010-05-29 17:15:03.515625000 +0200 ++++ pcmciautils-017/Makefile 2010-07-30 17:34:46.000000000 +0200 @@ -94,12 +94,13 @@ PWD = $(shell pwd) # If you are running a cross compiler, you may want to set this # to something more interesting, like "arm-linux-". If you want @@ -15,3 +15,71 @@ HOSTCC = gcc export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0 +@@ -264,30 +265,31 @@ clean: + + install-hotplug: + $(INSTALL) -d $(DESTDIR)$(hotplugdir) +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc + + uninstall-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc + + install-socket-hotplug: +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + uninstall-socket-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + install-socket-tools: +- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) ++ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) + + uninstall-socket-tools: + - rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) + + install-tools: + $(INSTALL) -d $(DESTDIR)$(sbindir) +- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) ++ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) + $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) +- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) ++ $(INSTALL) -d $(DESTDIR)$(udevhelperdir) ++ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) + + uninstall-tools: + - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) +@@ -296,22 +298,24 @@ uninstall-tools: + + install-config: + $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) +- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts ++ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts + if [ -f config/config.opts.$(ARCH) ]; then \ +- $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ ++ $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ + fi + + uninstall-config: + # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts + + install-udev: +- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules ++ $(INSTALL) -d $(DESTDIR)$(udevrulesdir) ++ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + uninstall-udev: + - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + install-man: +- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 ++ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 + $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 + + uninstall-man: diff --git a/package/rarpd/patches/patch-Makefile_in b/package/rarpd/patches/patch-Makefile_in new file mode 100644 index 000000000..58be90d10 --- /dev/null +++ b/package/rarpd/patches/patch-Makefile_in @@ -0,0 +1,9 @@ +--- rarpd-1.1.orig/Makefile.in 1999-10-20 22:57:13.000000000 +0200 ++++ rarpd-1.1/Makefile.in 2010-07-16 14:34:08.453125000 +0200 +@@ -13,5 +13,5 @@ rarpd: rarpd.o @LIBOBJS@ + $(CC) @LDFLAGS@ -o $@ rarpd.o @LIBOBJS@ @LIBS@ + + install: rarpd +- $(ENSUREDIR) $(DESTDIR)$(SBINDIR) 755 ++ @mkdir -p $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 0755 rarpd $(DESTDIR)$(SBINDIR) diff --git a/package/ruby/Makefile b/package/ruby/Makefile index a05372ca8..ea4e8b7a8 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= lang PKG_NOPARALLEL:= 1 PKG_URL:= http://www.ruby-lang.org PKG_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/ +PKG_HOST_DEPENDS:= !freebsd DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-p429.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}-1.9.1-p429 diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h deleted file mode 100644 index 3d7c124ca..000000000 --- a/package/uclibc++/patches/patch-include_unwind-cxx_h +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur uClibc++-0.2.2.orig/include/unwind-cxx.h uClibc++-0.2.2/include/unwind-cxx.h ---- uClibc++-0.2.2.orig/include/unwind-cxx.h 2007-06-04 00:51:12.000000000 +0200 -+++ uClibc++-0.2.2/include/unwind-cxx.h 2010-07-20 11:43:58.726496262 +0200 -@@ -134,6 +134,7 @@ - // These are explicitly GNU C++ specific.
-
- // This is the exception class we report -- "GNUCC++\0".
-+#ifndef __ARM_EABI_UNWINDER__
- const _Unwind_Exception_Class __gxx_exception_class
- = ((((((((_Unwind_Exception_Class) 'G'
- << 8 | (_Unwind_Exception_Class) 'N')
-@@ -143,6 +144,9 @@ - << 8 | (_Unwind_Exception_Class) '+')
- << 8 | (_Unwind_Exception_Class) '+')
- << 8 | (_Unwind_Exception_Class) '\0');
-+#else
-+= "GNUC++";
-+#endif
-
- // GNU C++ personality routine, Version 0.
- extern "C" _Unwind_Reason_Code __gxx_personality_v0
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index 5faaed56e..168938952 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -37,6 +37,18 @@ openbsd() { pkg_add -v xz } +openbsd_full() { + PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/" + export PKG_PATH + pkg_add -v bison + pkg_add -v zip + pkg_add -v intltool + pkg_add -v libIDL + pkg_add -v m4 + pkg_add -v autoconf-2.62p0 + pkg_add -v gperf +} + netbsd() { echo "Preparing NetBSD for OpenADK" PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/" @@ -51,10 +63,13 @@ netbsd() { pkg_add -vu gtar pkg_add -vu gsed pkg_add -vu gawk + pkg_add -vu gperf } netbsd_full() { echo "Preparing NetBSD for full OpenADK package builds" + PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/" + export PKG_PATH pkg_add -vu intltool pkg_add -vu lynx pkg_add -vu pkg-config @@ -62,11 +77,12 @@ netbsd_full() { pkg_add -vu bison pkg_add -vu libIDL pkg_add -vu xkbcomp + pkg_add -vu python26 } freebsd() { echo "Preparing FreeBSD for OpenADK" - pkg_add -r git gmake mksh bash wget unzip gtar gsed gawk + pkg_add -r git gmake mksh bash wget unzip gtar gsed gawk gperf } freebsd_full() { diff --git a/scripts/automake.dep b/scripts/automake.dep index 13e4e87a9..2cfd5d3ce 100644 --- a/scripts/automake.dep +++ b/scripts/automake.dep @@ -9,6 +9,8 @@ configure missing aclocal.m4 configure.in aclocal.m4 configure.ac aclocal.m4 acinclude.m4 +config-h.in configure.in +config-h.in configure.ac config.h.in configure.in config.h.in configure.ac config.h.in aclocal.m4 @@ -31,3 +33,4 @@ configure.in configure.files acinclude.m4 admin/libtool.m4.in acinclude.m4 admin/acinclude.m4.in acinclude.m4 libltdl/ltdl.m4 +libtoolize.in configure diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index f08ee812a..303935a9b 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -26,7 +26,6 @@ out=0 if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_PACKAGE_GIT ]];then NEED_CURLDEV="$NEED_CURLDEV git" - NEED_SSLDEV="$NEED_SSLDEV git" fi if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then NEED_RPM="$NEED_RPM rpm" @@ -36,6 +35,7 @@ fi if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_ZIP="$NEED_ZIP firefox" NEED_LIBIDL="$NEED_LIBIDL firefox" + NEED_PYTHON="$NEED_PYTHON firefox" fi if [[ -n $ADK_COMPILE_HEIMDAL ]]; then @@ -55,8 +55,15 @@ if [[ -n $ADK_COMPILE_AVAHI ]]; then NEED_PKGCONFIG="$NEED_PKGCONFIG avahi" fi +if [[ -n $ADK_COMPILE_AUTOCONF ]]; then + NEED_M4="$NEED_M4 autoconf" +fi + +if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then + NEED_AUTOCONF="$NEED_AUTOCONF automake" +fi + if [[ -n $ADK_PACKAGE_SQUID ]]; then - NEED_SSLDEV="$NEED_SSLDEV squid" NEED_GXX="$NEED_GXX squid" fi @@ -139,6 +146,20 @@ if [[ -n $NEED_MKFONTDIR ]]; then fi fi +if [[ -n $NEED_M4 ]]; then + if ! which m4 >/dev/null 2>&1; then + echo >&2 You need GNU m4 to build $NEED_M4 + out=1 + fi +fi + +if [[ -n $NEED_AUTOCONF ]]; then + if ! which autoconf >/dev/null 2>&1; then + echo >&2 You need autoconf to build $NEED_AUTOCONF + out=1 + fi +fi + if [[ -n $NEED_INTL ]]; then if ! which intltool-update >/dev/null 2>&1; then echo >&2 You need intltool to build $NEED_INTL @@ -220,13 +241,6 @@ if [[ -n $NEED_GLIBZWO ]]; then fi fi -if [[ -n $ADK_USE_CCACHE ]]; then - if ! which ccache >/dev/null 2>&1; then - echo >&2 You have selected to build with ccache, but ccache could not be found. - out=1 - fi -fi - if [[ -n $NEED_RPM ]]; then if ! which rpmbuild >/dev/null 2>&1; then echo >&2 You need rpmbuild to to use $NEED_RPM package backend @@ -241,4 +255,15 @@ if [[ -n $NEED_FLEX ]]; then fi fi +if [[ -n $NEED_PYTHON ]]; then + if ! which python >/dev/null 2>&1; then + if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then + echo >&2 You need python to to use $NEED_PYTHON package + out=1 + fi + fi +fi + +exit $out + exit $out diff --git a/scripts/tsort b/scripts/tsort index 77ffa1237..93df1aa8a 100755 --- a/scripts/tsort +++ b/scripts/tsort @@ -4,10 +4,10 @@ os=$(uname) case $os in - NetBSD|MirBSD|OpenBSD) + MirBSD|OpenBSD) /usr/bin/tsort -r ;; - FreeBSD) + NetBSD|FreeBSD) /usr/bin/tsort | tail -r ;; *) diff --git a/tools/cpio/src/cpio.c b/tools/cpio/src/cpio.c index 00f4a16b7..d91f25dc1 100644 --- a/tools/cpio/src/cpio.c +++ b/tools/cpio/src/cpio.c @@ -81,7 +81,8 @@ int sysv3; #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \ defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \ - defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) + defined (__OpenBSD__) || defined (__DragonFly__) || \ + defined (__APPLE__) || defined (__CYGWIN__) #include <sys/mtio.h> #else /* SVR4.2MP */ #include <sys/scsi.h> @@ -4495,7 +4496,8 @@ tseek(off_t n) int i = (n - poffs) / tapeblock; #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \ defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \ - defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) + defined (__OpenBSD__) || defined (__DragonFly__) || \ + defined (__APPLE__) || defined (__CYGWIN__) struct mtop mo; mo.mt_op = i > 0 ? MTFSR : MTBSR; mo.mt_count = i > 0 ? i : -i; @@ -4735,7 +4737,7 @@ mstat(void) emsg(3, "Error during stat() of archive"); done(1); } -#if defined (__linux__) +#if defined (__linux__) if ((mtst.st_mode&S_IFMT) == S_IFCHR) { struct mtget mg; if (ioctl(mt, MTIOCGET, &mg) == 0) @@ -4787,6 +4789,13 @@ mstat(void) if (ioctl(mt, MTIOCGET, &mg) == 0) tapeblock = mg.mt_blksiz; } +#elif defined (__CYGWIN__) + if ((mtst.st_mode&S_IFMT) == S_IFCHR) { + struct mtget mg; + if (ioctl(mt, MTIOCGET, &mg) == 0) + tapeblock = (mg.mt_dsreg&MT_ST_BLKSIZE_MASK) >> + MT_ST_BLKSIZE_SHIFT; + } #elif defined (__hpux) || defined (_AIX) #else /* SVR4.2MP */ if ((mtst.st_mode&S_IFMT) == S_IFCHR) { |