summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/cryptsetup/Makefile4
-rw-r--r--package/cryptsetup/patches/patch-ltmain_sh14
-rw-r--r--package/e2fsprogs/Makefile6
-rw-r--r--package/lvm/Makefile12
-rw-r--r--package/popt/Makefile14
5 files changed, 33 insertions, 17 deletions
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 491814c63..06d4c40ce 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
-PKG_VERSION:= 1.1.3
+PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 318a64470861ea5b92a52f2014f1e7c1
+PKG_MD5SUM:= 1f5b5a9d538e8a3c191fb7dd85b9b013
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt
diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh
index 4aa161aec..18ec3a2e4 100644
--- a/package/cryptsetup/patches/patch-ltmain_sh
+++ b/package/cryptsetup/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- cryptsetup-1.1.3.orig/ltmain.sh 2010-01-17 11:29:15.000000000 +0100
-+++ cryptsetup-1.1.3/ltmain.sh 2011-01-14 20:48:34.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- cryptsetup-1.3.1.orig/ltmain.sh 2011-04-18 13:06:09.000000000 +0200
++++ cryptsetup-1.3.1/ltmain.sh 2011-07-18 13:28:01.000000000 +0200
+@@ -5840,7 +5840,7 @@ func_mode_link ()
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 8c8788b2a..cd2c3caeb 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:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720
PKG_DESCR:= Ext2/3/4 filesystem utilities
PKG_SECTION:= fs
@@ -116,9 +116,9 @@ libuuid-install:
${IDIR_LIBUUID}/usr/lib
libuuid-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include/uuid
${CP} ${WRKBUILD}/lib/uuid/uuid.h \
- ${IDIR_LIBUUID_DEV}/usr/include
+ ${IDIR_LIBUUID_DEV}/usr/include/uuid
e2fsck-static-install:
ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 7863fe58e..981aa21b6 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= lvm
PKG_VERSION:= 2.02.80
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 816f4cee75674e3a21fd40f1961279f2
PKG_DESCR:= logical volume management
PKG_SECTION:= fs
@@ -13,11 +13,13 @@ PKG_DEPENDS:= libdevmapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
-PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER
+PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER LIBDEVMAPPER_DEV
PKGSD_DEVICE_MAPPER:= device-mapper utility
PKGSS_DEVICE_MAPPER:= libdevmapper
PKGSD_LIBDEVMAPPER:= device-mapper library
PKGSC_LIBDEVMAPPER:= libs
+PKGSD_LIBDEVMAPPER_DEV:=device-mapper headers
+PKGSC_LIBDEVMAPPER_DEV:=devel
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
@@ -27,6 +29,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION}))
$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER}))
+$(eval $(call PKG_template,LIBDEVMAPPER_DEV,libdevmapper-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER_DEV},${PKGSC_LIBDEVMAPPER_DEV}))
CONFIGURE_ARGS+= --with-user="" --with-group="" \
--with-optimisation="" \
@@ -41,6 +44,11 @@ libdevmapper-install:
${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
${IDIR_LIBDEVMAPPER}/usr/lib
+libdevmapper-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* \
+ ${IDIR_LIBDEVMAPPER_DEV}/usr/include
+
device-mapper-install:
${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 2c355dbfb..aead00fe5 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= popt
PKG_VERSION:= 1.16
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33
PKG_DESCR:= a command line option parsing library
PKG_SECTION:= libs
@@ -14,7 +14,8 @@ PKG_BUILDDEP:= libiconv
PKG_URL:= http://rpm5.org/
PKG_SITES:= http://rpm5.org/files/popt/
-PKG_SUBPKGS:= LIBPOPT
+PKG_SUBPKGS:= LIBPOPT LIBPOPT_DEV
+PKGSC_LIBPOPT_DEV:= devel
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
@@ -23,9 +24,16 @@ endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPOPT_DEV,libpopt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPOPT_DEV},${PKG_OPTS}))
+
+TARGET_LDFAGS+= -liconv
post-install:
${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib
+
+libpopt-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBPOPT_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPOPT_DEV}/usr/include
include ${TOPDIR}/mk/pkg-bottom.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:11:08 +0000