diff options
| -rw-r--r-- | package/coreutils/Makefile | 17 | ||||
| -rw-r--r-- | package/dbus/files/dbus.postinst | 7 | ||||
| -rw-r--r-- | package/firefox/Makefile | 4 | ||||
| -rw-r--r-- | package/freeglut/patches/patch-Makefile_in | 31 | ||||
| -rw-r--r-- | package/freeglut/patches/patch-progs_Makefile_in | 11 | ||||
| -rw-r--r-- | package/libXt/patches/patch-util_Makefile_in | 11 |
6 files changed, 73 insertions, 8 deletions
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 1e85c09d4..1d279d96c 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -4,28 +4,39 @@ include $(TOPDIR)/rules.mk PKG_NAME:= coreutils -PKG_VERSION:= 8.5 +PKG_VERSION:= 8.15 PKG_RELEASE:= 1 -PKG_MD5SUM:= c1ffe586d001e87d66cd80c4536ee823 +PKG_MD5SUM:= 094909fafa86110140b32e4948941545 PKG_DESCR:= basic file, shell and text manipulation utilities PKG_SECTION:= base +PKG_BUILDDEP:= gmp PKG_URL:= http://www.gnu.org/software/coreutils/ PKG_SITES:= http://ftp.gnu.org/gnu/coreutils/ -PKG_SUBPKGS:= TSORT SHA256SUM +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz + +PKG_SUBPKGS:= TSORT SHA256SUM TOUCH PKGSD_TSORT:= topological sort utility PKGSC_TSORT:= misc PKGSD_SHA256SUM:= SHA1 256 bit checksum utility PKGSC_SHA256SUM:= misc +PKGSD_TOUCH:= touch utility +PKGSC_TOUCH:= misc include $(TOPDIR)/mk/package.mk #$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT})) +$(eval $(call PKG_template,TOUCH,touch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TOUCH},${PKGSC_TOUCH})) $(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKGSC_SHA256SUM})) CONFIGURE_ARGS+= --disable-rpath +touch-install: + $(INSTALL_DIR) $(IDIR_TOUCH)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/touch \ + $(IDIR_TOUCH)/usr/bin + tsort-install: $(INSTALL_DIR) $(IDIR_TSORT)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/tsort \ diff --git a/package/dbus/files/dbus.postinst b/package/dbus/files/dbus.postinst index 713c1c63a..97c5dd37a 100644 --- a/package/dbus/files/dbus.postinst +++ b/package/dbus/files/dbus.postinst @@ -5,5 +5,8 @@ add_group messagebus $gid add_user messagebus $(get_next_uid) $gid /var/run/dbus add_rcconf dbus dbus NO echo Generating UUID -mkdir /lib/dbus /var/lib && ln -sf /lib/dbus /var/lib/dbus -dbus-uuidgen --ensure +if [ -z $IPKG_INSTROOT ];then + mkdir /lib/dbus /var/lib + ln -sf /lib/dbus /var/lib/dbus + dbus-uuidgen --ensure +fi diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 942034570..eb4080edc 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -21,7 +21,7 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= x86 x86_64 native mips PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin -PKG_SYSTEM_DEPENDS:= ibm-x40 lemote-yeelong +PKG_SYSTEM_DEPENDS:= ibm-x40 lemote-yeelong qemu-i686 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-release @@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-accessibility \ --disable-smil \ --disable-dbus \ - --disable-debug \ + --enable-debug \ --disable-logging \ --disable-strip \ --disable-install-strip \ diff --git a/package/freeglut/patches/patch-Makefile_in b/package/freeglut/patches/patch-Makefile_in new file mode 100644 index 000000000..143efe98a --- /dev/null +++ b/package/freeglut/patches/patch-Makefile_in @@ -0,0 +1,31 @@ +--- freeglut-2.6.0.orig/Makefile.in 2009-11-25 20:14:30.000000000 +0100 ++++ freeglut-2.6.0/Makefile.in 2012-03-12 15:05:53.767407283 +0100 +@@ -220,28 +220,6 @@ EXTRA_DIST = \ + freeglut_static_vs2008.vcproj \ + freeglut_vs2008.sln \ + freeglut_vs2008.vcproj \ +- progs/demos/CallbackMaker/CallbackMakerStatic.dsp \ +- progs/demos/CallbackMaker/CallbackMakerStatic_vs2008.vcproj \ +- progs/demos/CallbackMaker/CallbackMaker_vs2008.vcproj \ +- progs/demos/Fractals/FractalsStatic.dsp \ +- progs/demos/Fractals/FractalsStatic_vs2008.vcproj \ +- progs/demos/Fractals/Fractals_vs2008.vcproj \ +- progs/demos/Fractals_random/Fractals_randomStatic.dsp \ +- progs/demos/Fractals_random/Fractals_randomStatic_vs2008.vcproj \ +- progs/demos/Fractals_random/Fractals_random_vs2008.vcproj \ +- progs/demos/Lorenz/lorenzStatic.dsp \ +- progs/demos/Lorenz/lorenzStatic_vs2008.vcproj \ +- progs/demos/Lorenz/lorenz_vs2008.vcproj \ +- progs/demos/One/oneStatic.dsp \ +- progs/demos/One/oneStatic_vs2008.vcproj \ +- progs/demos/One/one_vs2008.vcproj \ +- progs/demos/demos_vs2008.sln \ +- progs/demos/shapes/shapesStatic.dsp \ +- progs/demos/shapes/shapesStatic_vs2008.vcproj \ +- progs/demos/shapes/shapes_vs2008.vcproj \ +- progs/demos/smooth_opengl3/smooth_opengl3Static.dsp \ +- progs/demos/smooth_opengl3/smooth_opengl3Static_vs2008.vcproj \ +- progs/demos/smooth_opengl3/smooth_opengl3_vs2008.vcproj + + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/package/freeglut/patches/patch-progs_Makefile_in b/package/freeglut/patches/patch-progs_Makefile_in new file mode 100644 index 000000000..e5d2993d1 --- /dev/null +++ b/package/freeglut/patches/patch-progs_Makefile_in @@ -0,0 +1,11 @@ +--- freeglut-2.6.0.orig/progs/Makefile.in 2009-11-25 20:14:29.000000000 +0100 ++++ freeglut-2.6.0/progs/Makefile.in 2012-03-12 15:06:38.667411355 +0100 +@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = demos ++SUBDIRS = + all: all-recursive + + .SUFFIXES: diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in index 2ec3ddf38..3a66fdb31 100644 --- a/package/libXt/patches/patch-util_Makefile_in +++ b/package/libXt/patches/patch-util_Makefile_in @@ -1,5 +1,5 @@ --- libXt-1.0.9.orig/util/Makefile.in 2010-10-28 21:04:12.000000000 +0200 -+++ libXt-1.0.9/util/Makefile.in 2011-11-05 16:05:13.000000000 +0100 ++++ libXt-1.0.9/util/Makefile.in 2012-03-12 15:28:44.703027309 +0100 @@ -108,7 +108,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CHANGELOG_CMD = @CHANGELOG_CMD@ @@ -9,3 +9,12 @@ CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +@@ -231,7 +231,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) +-makestrs_CFLAGS = $(XT_CFLAGS) ++makestrs_CFLAGS = + makestrs_SOURCES = makestrs.c + + # Man page |