diff options
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | package/drbd/patches/patch-Makefile_in | 10 | ||||
| -rw-r--r-- | package/drbd/patches/patch-drbd_Makefile | 12 | ||||
| -rw-r--r-- | package/ffmpeg/Makefile | 1 | ||||
| -rw-r--r-- | package/forked-daapd/Makefile | 2 | ||||
| -rw-r--r-- | package/libXt/Makefile | 1 | ||||
| -rw-r--r-- | package/libXt/patches/patch-util_Makefile_in | 4 |
7 files changed, 23 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index 886ecaf09..5b32abe6c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -271,7 +271,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU +export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU SHELL endif all: menuconfig diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in index 71ece3f6f..ad87d221d 100644 --- a/package/drbd/patches/patch-Makefile_in +++ b/package/drbd/patches/patch-Makefile_in @@ -1,9 +1,11 @@ --- drbd-8.3.10.orig/Makefile.in 2011-01-26 14:57:59.000000000 +0100 -+++ drbd-8.3.10/Makefile.in 2011-05-23 17:11:50.000000000 +0200 -@@ -56,7 +56,7 @@ KDIR ?= /lib/modules/$(KVER)/build - # and not in e.g. dash. I'm too lazy to fix it to be compatible. - SHELL=/bin/bash ++++ drbd-8.3.10/Makefile.in 2011-10-23 10:20:12.000000000 +0200 +@@ -54,9 +54,7 @@ KDIR ?= /lib/modules/$(KVER)/build + # for some reason some of the commands below only work correctly in bash, + # and not in e.g. dash. I'm too lazy to fix it to be compatible. +-SHELL=/bin/bash +- -SUBDIRS = user scripts documentation drbd +SUBDIRS = user scripts drbd diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile index dffd1e258..62f61cab4 100644 --- a/package/drbd/patches/patch-drbd_Makefile +++ b/package/drbd/patches/patch-drbd_Makefile @@ -1,6 +1,14 @@ --- drbd-8.3.10.orig/drbd/Makefile 2011-01-26 14:57:59.000000000 +0100 -+++ drbd-8.3.10/drbd/Makefile 2011-05-23 17:11:50.000000000 +0200 -@@ -133,7 +133,7 @@ else ++++ drbd-8.3.10/drbd/Makefile 2011-10-23 10:22:50.000000000 +0200 +@@ -65,7 +65,6 @@ else + + # for some reason some of the commands below only work correctly in bash, + # and not in e.g. dash. I'm too lazy to fix it to be compatible. +- SHELL=/bin/bash + + DRBDSRC := $(shell pwd) + +@@ -133,7 +132,7 @@ else grep return $@ ; \ fi ; \ echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index aabe94394..0bf164017 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -112,6 +112,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --host-cc=$(CC_FOR_BUILD) \ --disable-doc \ --disable-debug \ + --disable-yasm \ --disable-optimizations \ --disable-stripping \ --enable-shared \ diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile index 824d05636..49583bb11 100644 --- a/package/forked-daapd/Makefile +++ b/package/forked-daapd/Makefile @@ -18,6 +18,8 @@ PKG_SITES:= http://alioth.debian.org/~jblache/forked-daapd/ PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER PKG_ARCH_DEPENDS:= !ppc +# gperf problem +PKG_HOST_DEPENDS:= !freebsd include $(TOPDIR)/mk/package.mk diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 87e593339..84d467951 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV})) +CFLAGS_FOR_BUILD+= -I/usr/local/include TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in index 8b2d3079c..856fa8e79 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-01-24 17:53:22.000000000 +0100 ++++ libXt-1.0.9/util/Makefile.in 2011-11-05 16:05:13.000000000 +0100 @@ -108,7 +108,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CHANGELOG_CMD = @CHANGELOG_CMD@ @@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) -makestrs_CFLAGS = $(XT_CFLAGS) -+makestrs_CFLAGS = ++makestrs_CFLAGS = $(CFLAGS_FOR_BUILD) makestrs_SOURCES = makestrs.c # Man page |