OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Sep-2007 10:29:21
Branch: HEAD Handle: 2007093009292100
Modified files:
openpkg-src/gettext gettext.patch gettext.spec
Log:
fix __APPLE_CC_ usage
Summary:
Revision Changes Path
1.11 +37 -4 openpkg-src/gettext/gettext.patch
1.70 +16 -3 openpkg-src/gettext/gettext.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gettext/gettext.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 gettext.patch
--- openpkg-src/gettext/gettext.patch 11 Jul 2007 21:05:16 -0000 1.10
+++ openpkg-src/gettext/gettext.patch 30 Sep 2007 08:29:21 -0000 1.11
@@ -1,6 +1,39 @@
+Index: gettext-runtime/intl/libgnuintl.h.in
+--- gettext-runtime/intl/libgnuintl.h.in.orig 2006-11-27 18:02:00
+0100
++++ gettext-runtime/intl/libgnuintl.h.in 2007-09-30 10:24:14 +0200
+@@ -88,7 +88,7 @@
+ If he doesn't, we choose the method. A third possible method is
+ _INTL_REDIRECT_ASM, supported only by GCC. */
+ #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
+-# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ &&
!(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
++# if __GNUC__ >= 2 && !(__APPLE_CC__+0 > 1) && !defined __MINGW32__ &&
!(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+ # define _INTL_REDIRECT_ASM
+ # else
+ # ifdef __cplusplus
+@@ -110,7 +110,7 @@
+ /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may
return
+ its n-th argument literally. This enables GCC to warn for example about
+ printf (gettext ("foo %y")). */
+-#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
++#if __GNUC__ >= 3 && !(__APPLE_CC__+0 > 1 && defined __cplusplus)
+ # define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
+ #else
+ # define _INTL_MAY_RETURN_STRING_ARG(n)
+Index: gettext-runtime/intl/plural-exp.c
+--- gettext-runtime/intl/plural-exp.c.orig 2006-11-27 18:02:00 +0100
++++ gettext-runtime/intl/plural-exp.c 2007-09-30 10:24:51 +0200
+@@ -27,7 +27,7 @@
+
+ #include "plural-exp.h"
+
+-#if (defined __GNUC__ && !(__APPLE_CC__ > 1)) \
++#if (defined __GNUC__ && !(__APPLE_CC__+0 > 1)) \
+ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+
+ /* These structs are the constant expression for the germanic plural
Index: gettext-tools/gnulib-lib/execute.c
--- gettext-tools/gnulib-lib/execute.c.orig 2006-11-27 18:14:50 +0100
-+++ gettext-tools/gnulib-lib/execute.c 2007-07-11 22:40:24 +0200
++++ gettext-tools/gnulib-lib/execute.c 2007-09-30 10:23:36 +0200
@@ -193,6 +193,9 @@
dependent which error is reported which way. We treat both cases as
equivalent. */
@@ -13,7 +46,7 @@
bool actions_allocated;
Index: gettext-tools/gnulib-lib/vasprintf.c
--- gettext-tools/gnulib-lib/vasprintf.c.orig 2006-11-27 18:14:53
+0100
-+++ gettext-tools/gnulib-lib/vasprintf.c 2007-07-11 22:40:24 +0200
++++ gettext-tools/gnulib-lib/vasprintf.c 2007-09-30 10:23:36 +0200
@@ -32,13 +32,14 @@
#endif
@@ -51,7 +84,7 @@
int
Index: gettext-tools/libgettextpo/vasprintf.c
--- gettext-tools/libgettextpo/vasprintf.c.orig 2006-11-27 18:15:09
+0100
-+++ gettext-tools/libgettextpo/vasprintf.c 2007-07-11 22:41:59 +0200
++++ gettext-tools/libgettextpo/vasprintf.c 2007-09-30 10:23:36 +0200
@@ -32,13 +32,14 @@
#endif
@@ -89,7 +122,7 @@
int
Index: gnulib-local/lib/vasprintf.c
--- gnulib-local/lib/vasprintf.c.orig 2006-09-15 14:01:51 +0200
-+++ gnulib-local/lib/vasprintf.c 2007-07-11 22:40:24 +0200
++++ gnulib-local/lib/vasprintf.c 2007-09-30 10:23:36 +0200
@@ -32,13 +32,14 @@
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gettext/gettext.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 gettext.spec
--- openpkg-src/gettext/gettext.spec 20 Jul 2007 06:46:00 -0000 1.69
+++ openpkg-src/gettext/gettext.spec 30 Sep 2007 08:29:21 -0000 1.70
@@ -33,7 +33,7 @@
Group: Charset
License: GPL
Version: 0.16.1
-Release: 20070720
+Release: 20070930
# list of sources
Source0: ftp://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
@@ -60,10 +60,13 @@
%prep
%setup -q
%patch -p0
+
+%build
# strip Automake version numbers from binaries
%{l_shtool} subst \
-e 's;-${am__api_version};;g' \
- `find . -name configure`
+ `find . -name configure -print`
+
# remove part that conflicts with libiconv
%{l_shtool} subst \
-e '/localcharset.\$lo/d' \
@@ -76,6 +79,8 @@
-e 's;^.*intl-java/Makefile.*$;;' \
-e 's;^.*intl-csharp/Makefile.*$;;' \
gettext-runtime/configure
+
+ # disable a few parts from building
%{l_shtool} subst \
-e 's;@BUILDJAVA@;no;g' \
-e 's;@BUILDJAVAEXE@;no;g' \
@@ -89,7 +94,7 @@
gettext-tools/src/read-java.c \
gettext-tools/src/urlget.c
-%build
+ # configure toolkit
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -107,13 +112,19 @@
--disable-csharp \
--disable-java \
--disable-shared
+
+ # build toolkit
%{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+
+ # install toolkit
%{l_make} %{l_mflags} install \
AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
DESTDIR=$RPM_BUILD_ROOT
+
+ # strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gettext/projects
@@ -122,6 +133,8 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/xemacs
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libgettext*.la
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
