From d29b7059e0e3dacc3e051c310eabaecabe19a8d2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 12 Nov 2010 22:58:45 +0100
Subject: updates and build fixes for a lot of packages
compiled for ibmx40 with eglibc.
---
package/popt/Makefile | 6 +-
package/popt/patches/patch-Makefile_in | 11 ----
package/popt/patches/patch-po_Makefile_in | 100 ------------------------------
3 files changed, 3 insertions(+), 114 deletions(-)
delete mode 100644 package/popt/patches/patch-Makefile_in
delete mode 100644 package/popt/patches/patch-po_Makefile_in
(limited to 'package/popt')
diff --git a/package/popt/Makefile b/package/popt/Makefile
index f8d43aac0..9a59abba3 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= popt
-PKG_VERSION:= 1.15
-PKG_RELEASE:= 2
-PKG_MD5SUM:= c61ef795fa450eb692602a661ec8d7f1
+PKG_VERSION:= 1.16
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33
PKG_DESCR:= a command line option parsing library
PKG_SECTION:= libs
PKG_DEPENDS:= libiconv
diff --git a/package/popt/patches/patch-Makefile_in b/package/popt/patches/patch-Makefile_in
deleted file mode 100644
index 6b66fe02f..000000000
--- a/package/popt/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- popt-1.15.orig/Makefile.in 2009-04-12 21:31:13.000000000 +0200
-+++ popt-1.15/Makefile.in 2009-10-31 23:17:36.793465302 +0100
-@@ -80,7 +80,7 @@ libpopt_la_OBJECTS = $(am_libpopt_la_OBJ
- libpopt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libpopt_la_LDFLAGS) $(LDFLAGS) -o $@
--PROGRAMS = $(noinst_PROGRAMS)
-+PROGRAMS =
- am_test1_OBJECTS = test1.$(OBJEXT)
- test1_OBJECTS = $(am_test1_OBJECTS)
- test1_DEPENDENCIES = $(usrlib_LTLIBRARIES)
diff --git a/package/popt/patches/patch-po_Makefile_in b/package/popt/patches/patch-po_Makefile_in
deleted file mode 100644
index 6a4819b3c..000000000
--- a/package/popt/patches/patch-po_Makefile_in
+++ /dev/null
@@ -1,100 +0,0 @@
---- popt-1.15.orig/po/Makefile.in 2009-04-12 21:31:23.000000000 +0200
-+++ popt-1.15/po/Makefile.in 2009-10-31 23:15:58.617450982 +0100
-@@ -22,42 +22,42 @@ srcdir = .
- top_srcdir = ..
-
-
--prefix = /usr/local
-+prefix = /usr
- exec_prefix = ${prefix}
- datarootdir = ${prefix}/share
--datadir = ${datarootdir}
-+datadir = /usr/share
- localedir = ${datarootdir}/locale
- gettextsrcdir = $(datadir)/gettext/po
-
--INSTALL = /usr/opkg/bin/ginstall -c
-+INSTALL = /usr/bin/install -c
- INSTALL_DATA = ${INSTALL} -m 644
-
- # We use $(mkdir_p).
- # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
- # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
--# $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh does not start with $(SHELL), so we add it.
--# In automake >= 1.10, /usr/opkg/bin/gmkdir -p is derived from ${MKDIR_P}, which is defined
-+# $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh does not start with $(SHELL), so we add it.
-+# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
- # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
- # versions, $(mkinstalldirs) and $(install_sh) are unused.
--mkinstalldirs = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh -d
--install_sh = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh
--MKDIR_P = /usr/opkg/bin/gmkdir -p
--mkdir_p = /usr/opkg/bin/gmkdir -p
-+mkinstalldirs = $(SHELL) $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh -d
-+install_sh = $(SHELL) $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh
-+MKDIR_P = /bin/mkdir -p
-+mkdir_p = /bin/mkdir -p
-
--GMSGFMT_ = /usr/opkg/bin/msgfmt
--GMSGFMT_no = /usr/opkg/bin/msgfmt
--GMSGFMT_yes = /usr/opkg/bin/msgfmt
-+GMSGFMT_ = /usr/bin/msgfmt
-+GMSGFMT_no = /usr/bin/msgfmt
-+GMSGFMT_yes = /usr/bin/msgfmt
- GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
--MSGFMT_ = /usr/opkg/bin/msgfmt
--MSGFMT_no = /usr/opkg/bin/msgfmt
--MSGFMT_yes = /usr/opkg/bin/msgfmt
-+MSGFMT_ = /usr/bin/msgfmt
-+MSGFMT_no = /usr/bin/msgfmt
-+MSGFMT_yes = /usr/bin/msgfmt
- MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
--XGETTEXT_ = /usr/opkg/bin/xgettext
--XGETTEXT_no = /usr/opkg/bin/xgettext
--XGETTEXT_yes = /usr/opkg/bin/xgettext
-+XGETTEXT_ = /usr/bin/xgettext
-+XGETTEXT_no = /usr/bin/xgettext
-+XGETTEXT_yes = /usr/bin/xgettext
- XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
- MSGMERGE = msgmerge
--MSGMERGE_UPDATE = /usr/opkg/bin/msgmerge --update
-+MSGMERGE_UPDATE = /usr/bin/msgmerge --update
- MSGINIT = msginit
- MSGCONV = msgconv
- MSGFILTER = msgfilter
-@@ -96,7 +96,7 @@ CATALOGS = @CATALOGS@
- mv t-$@ $@
-
-
--all: check-macro-version all-yes
-+all: check-macro-version all-no
-
- all-yes: stamp-po
- all-no:
-@@ -202,7 +202,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
-
- install: install-exec install-data
- install-exec:
--install-data: install-data-yes
-+install-data: install-data-no
- if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- for file in $(DISTFILES.common) Makevars.template; do \
-@@ -261,7 +261,7 @@ install-strip: install
-
- installdirs: installdirs-exec installdirs-data
- installdirs-exec:
--installdirs-data: installdirs-data-yes
-+installdirs-data: installdirs-data-no
- if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- else \
-@@ -306,7 +306,7 @@ installcheck:
-
- uninstall: uninstall-exec uninstall-data
- uninstall-exec:
--uninstall-data: uninstall-data-yes
-+uninstall-data: uninstall-data-no
- if test "$(PACKAGE)" = "gettext-tools"; then \
- for file in $(DISTFILES.common) Makevars.template; do \
- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
--
cgit v1.2.3