浏览代码

disable rpath, enable TLS, fix cross-compile on Darwin

Waldemar Brodkorb 14 年之前
父节点
当前提交
a34589bab6
共有 2 个文件被更改,包括 13 次插入2 次删除
  1. 2 2
      package/e2fsprogs/Makefile
  2. 11 0
      package/e2fsprogs/patches/patch-e2fsck_Makefile_in

+ 2 - 2
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 \

+ 11 - 0
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)
+