summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/popt/Makefile13
-rw-r--r--package/popt/patches/patch-ltmain_sh11
2 files changed, 8 insertions, 16 deletions
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 89dbd91c9..0a36d6b81 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -4,17 +4,18 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= popt
-PKG_VERSION:= 1.16
-PKG_RELEASE:= 4
-PKG_HASH:= e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
+PKG_VERSION:= 1.18
+PKG_RELEASE:= 1
+PKG_HASH:= 36245242c59b5a33698388e415a3e1efa2d48fc4aead91aeb2810b4c0744f4e3
PKG_DESCR:= command line option parsing library
PKG_SECTION:= libs/misc
PKG_URL:= http://rpm5.org/
-PKG_SITES:= https://distfiles.openadk.org/
+PKG_SITES:= https://github.com/rpm-software-management/popt/archive/refs/tags/
PKG_LIBNAME:= libpopt
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-release.tar.gz
+WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_NAME}-${PKG_VERSION}-release
include ${ADK_TOPDIR}/mk/host.mk
include ${ADK_TOPDIR}/mk/package.mk
@@ -22,6 +23,8 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call HOST_template,POPT,popt,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+AUTOTOOL_STYLE:= autogen
+
libpopt-install:
${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib
${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib
diff --git a/package/popt/patches/patch-ltmain_sh b/package/popt/patches/patch-ltmain_sh
deleted file mode 100644
index 821e07bad..000000000
--- a/package/popt/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- popt-1.16.orig/ltmain.sh 2010-05-04 22:55:45.000000000 +0200
-+++ popt-1.16/ltmain.sh 2011-02-05 23:13:17.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -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*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"