diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/xfsprogs/patches/patch-include_buildmacros | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/xfsprogs/patches/patch-include_buildmacros')
| -rw-r--r-- | package/xfsprogs/patches/patch-include_buildmacros | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/package/xfsprogs/patches/patch-include_buildmacros b/package/xfsprogs/patches/patch-include_buildmacros index f163f3f2b..ad07f23d2 100644 --- a/package/xfsprogs/patches/patch-include_buildmacros +++ b/package/xfsprogs/patches/patch-include_buildmacros @@ -1,12 +1,11 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- xfsprogs-3.0.0.orig/include/buildmacros 2009-02-04 23:29:25.000000000 +0100 -+++ xfsprogs-3.0.0/include/buildmacros 2009-03-27 11:45:29.000000000 +0100 -@@ -48,7 +48,7 @@ LTINSTALL = $(LIBTOOL) --mode=install $( - LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF) +--- xfsprogs-3.1.1.orig/include/buildmacros 2010-01-29 20:46:13.000000000 +0100 ++++ xfsprogs-3.1.1/include/buildmacros 2010-02-13 23:57:06.000000000 +0100 +@@ -32,7 +32,7 @@ OBJECTS = $(ASFILES:.s=.o) \ - ifeq ($(ENABLE_SHARED),yes) --LTLDFLAGS += -rpath $(PKG_LIB_DIR) -+#LTLDFLAGS += -rpath $(PKG_LIB_DIR) - LTLDFLAGS += -version-info $(LTVERSION) - endif + INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) + +-SHELL = /bin/sh ++SHELL ?= bash + IMAGES_DIR = $(TOPDIR)/all-images + DIST_DIR = $(TOPDIR)/dist |