summaryrefslogtreecommitdiff
path: root/package/file
diff options
context:
space:
mode:
Diffstat (limited to 'package/file')
-rw-r--r--package/file/Makefile27
-rw-r--r--package/file/patches/patch-magic_Makefile_in11
2 files changed, 14 insertions, 24 deletions
diff --git a/package/file/Makefile b/package/file/Makefile
index b96ee1d87..268206130 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -4,12 +4,12 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= file
-PKG_VERSION:= 5.11
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 16a407bd66d6c7a832f3a5c0d609c27b
+PKG_VERSION:= 5.15
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 3f99565532f548d7540912c4642d1ede
PKG_DESCR:= a file type guesser
PKG_SECTION:= utils
-PKG_DEPENDS:= libmagic
+PKG_DEPENDS:= libmagic libgcc
PKG_URL:= http://www.darwinsys.com/file
PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \
ftp://ftp.astron.com/pub/file/
@@ -24,19 +24,19 @@ ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
endif
+include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FILE,file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call HOST_template,FILE,file,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC},${PKG_OPTS}))
-pre-configure:
- (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
- ./configure --enable-static --disable-shared \
- --disable-warnings \
- );
- ${MAKE} -C ${WRKBUILD}
- ${INSTALL_BIN} ${WRKBUILD}/src/file ${WRKBUILD}/magic
- ${MAKE} -C ${WRKBUILD} clean
+HOST_CONFIGURE_ARGS+= --enable-static \
+ --disable-shared \
+ --disable-warnings
+file-hostinstall:
+ ${INSTALL_BIN} ${HOST_WRKINST}/usr/bin/file \
+ ${STAGING_HOST_DIR}/usr/bin
file-install:
${INSTALL_DIR} ${IDIR_FILE}/usr/bin
@@ -49,4 +49,5 @@ libmagic-install:
${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib
${CP} ${WRKINST}/usr/lib/libmagic.so* ${IDIR_LIBMAGIC}/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/file/patches/patch-magic_Makefile_in b/package/file/patches/patch-magic_Makefile_in
deleted file mode 100644
index 1a8b3a66c..000000000
--- a/package/file/patches/patch-magic_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- file-5.11.orig/magic/Makefile.in 2012-02-21 20:17:03.000000000 +0100
-+++ file-5.11/magic/Makefile.in 2012-03-02 17:23:17.000000000 +0100
-@@ -450,7 +450,7 @@ CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_D
-
- # FIXME: Build file natively as well so that it can be used to compile
- # the target's magic file; for now we bail if the local version does not match
--@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file
-+@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = ./file
- @IS_CROSS_COMPILE_FALSE@FILE_COMPILE_DEP = $(FILE_COMPILE)
- @IS_CROSS_COMPILE_TRUE@FILE_COMPILE_DEP =
- all: all-am