summaryrefslogtreecommitdiff
path: root/package/e2fsprogs
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-06 23:21:52 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-06 23:21:52 +0100
commita34589bab665fdf945eaa22d756b45418763deea (patch)
tree948cd3cb4556d7562a07b3b1c3131c7008d4b47a /package/e2fsprogs
parent5a65c76bc3d72ea9f275a3c474d5e308cf367a82 (diff)
disable rpath, enable TLS, fix cross-compile on Darwin
Diffstat (limited to 'package/e2fsprogs')
-rw-r--r--package/e2fsprogs/Makefile4
-rw-r--r--package/e2fsprogs/patches/patch-e2fsck_Makefile_in11
2 files changed, 13 insertions, 2 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index c54538f0c..48bec82a8 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= e2fsprogs
PKG_VERSION:= 1.41.14
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720
PKG_DESCR:= Ext2/3/4 filesystem utilities
PKG_SECTION:= fs
@@ -35,7 +35,7 @@ $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PK
CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath
INSTALL_TARGET+= install-libs
-TCFLAGS+= -pthread
+TLDFLAGS+= -pthread
pre-build:
${MAKE} -C ${WRKBUILD}/util \
diff --git a/package/e2fsprogs/patches/patch-e2fsck_Makefile_in b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in
new file mode 100644
index 000000000..2b43d8cec
--- /dev/null
+++ b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.41.14.orig/e2fsck/Makefile.in 2010-12-22 16:49:20.000000000 +0100
++++ e2fsprogs-1.41.14/e2fsck/Makefile.in 2011-01-06 23:10:49.000000000 +0100
+@@ -16,7 +16,7 @@ MANPAGES= e2fsck.8
+ FMANPAGES= e2fsck.conf.5
+ XTRA_CFLAGS= -DRESOURCE_TRACK -I.
+
+-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P)
++LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBUUID) $(LIBBLKID) $(LIBINTL) $(LIBE2P)
+ DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) \
+ $(DEPLIBE2P)
+