Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-10-29 Laszlo Peter <[email protected]>
authorlaca
Fri, 29 Oct 2004 01:28:51 +0000
changeset 4365 d8676a6421af
parent 4364 8dfdf689c84a
child 4366 87a72407f6a1
2004-10-29 Laszlo Peter <[email protected]> * GConf.spec, ORBit2.spec, atk.spec, glib2.spec, gtk2.spec, libIDL.spec, libbonobo.spec, libglade.spec, pango.spec: use $CC64 as the 64-bit compiler, if defined
ChangeLog file | annotate | diff | comparison | revisions
GConf.spec file | annotate | diff | comparison | revisions
ORBit2.spec file | annotate | diff | comparison | revisions
atk.spec file | annotate | diff | comparison | revisions
glib2.spec file | annotate | diff | comparison | revisions
gtk2.spec file | annotate | diff | comparison | revisions
libIDL.spec file | annotate | diff | comparison | revisions
libbonobo.spec file | annotate | diff | comparison | revisions
libglade.spec file | annotate | diff | comparison | revisions
pango.spec file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Fri Oct 29 01:25:47 2004 +0000
+++ b/ChangeLog	Fri Oct 29 01:28:51 2004 +0000
@@ -1,3 +1,9 @@
+2004-10-29  Laszlo Peter  <[email protected]>
+
+	* GConf.spec, ORBit2.spec, atk.spec, glib2.spec, gtk2.spec,
+	  libIDL.spec, libbonobo.spec, libglade.spec, pango.spec:
+	  use $CC64 as the 64-bit compiler, if defined
+
 2004-10-29  Laszlo Peter  <[email protected]>
 
 	* evolution.spec: add gnome-pilot build dep
--- a/GConf.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/GConf.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -91,6 +91,10 @@
 export CFLAGS="$CFLAGS64"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
 export LDFLAGS="$LDFLAGS64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 ./configure $CONFLAGS					\
             --bindir=%{_bindir}/%{_arch64}		\
@@ -104,7 +108,12 @@
 cd ../GConf-%version
 
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
-export LDFLAGS="$LDFLGS32"
+export LDFLAGS="$LDFLAGS32"
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
+
 %endif
 %endif
 
@@ -172,6 +181,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Sat Oct  2 2004 - [email protected]
 - Create 64bit libraries for Solaris
 
--- a/ORBit2.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/ORBit2.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -94,6 +94,10 @@
 
 export CFLAGS="$CFLAGS64"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 libtoolize --copy --force
 aclocal -I %{_datadir}/aclocal
@@ -112,6 +116,10 @@
 cd ../ORBit2-%version
 
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
 
 %endif
 %endif
@@ -188,6 +196,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Sat Oct  2 2004 - [email protected]
 - Create 64bit libraries for Solaris
 
--- a/atk.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/atk.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -63,6 +63,10 @@
 CPUS=$(($CPUS*4))
 
 %ifarch amd64 sparcv9
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 cd ../atk-%version-64
 export CFLAGS="$CFLAGS64"
 export LDFLAGS="$LDFLAGS64"
@@ -77,12 +81,16 @@
 
 make -j $CPUS
 cd ../atk-%version
-%endif
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
 
 export LDFLAGS="$LDFLAGS32"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
 
 %endif
+%endif
 
 
 CFLAGS="$RPM_OPT_FLAGS"			\
@@ -129,6 +137,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Sat Oct  2 2004 - [email protected]
 - Create 64bit libraries for Solaris
 
--- a/glib2.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/glib2.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -88,6 +88,10 @@
 
 export CFLAGS="$CFLAGS64"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 ./configure $CONFLAGS					\
 	    --bindir=%{_bindir}/%{_arch64}		\
@@ -100,7 +104,11 @@
 
 cd ../glib-%version
 
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
 %endif
 %endif
 
@@ -165,6 +173,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Wed Oct 05 2004 - [email protected]
 - Added glib-04-convert-utf8.diff to fix CR 5055972
 
--- a/gtk2.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/gtk2.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -131,6 +131,10 @@
 export CFLAGS="$CFLAGS64"
 export LDFLAGS="$LDFLAGS64"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 libtoolize --force
 aclocal $ACLOCAL_FLAGS -I .
@@ -148,8 +152,13 @@
 
 cd ../gtk+-%version
 
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="$LDFLAGS32"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
+
 %endif
 %endif
 
@@ -239,6 +248,9 @@
 %{_mandir}/man3/*.gz
 
 %changelog -n gtk2
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Sat Oct  2 2004 - [email protected]
 - Create 64bit libraries for Solaris
 
--- a/libIDL.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/libIDL.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -72,6 +72,10 @@
 
 export CFLAGS="$CFLAGS64"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 ./configure $CONFLAGS					\
             --bindir=%{_bindir}/%{_arch64}		\
@@ -83,8 +87,11 @@
 
 cd ../libIDL-%version
 
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
 
 %endif
 %endif
@@ -133,6 +140,9 @@
 %{_infodir}/*.info.gz
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Sat Oct  2 2004 - [email protected]
 - Create 64bit libraries for Solaris
 
--- a/libbonobo.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/libbonobo.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -96,8 +96,11 @@
 
 export CFLAGS="$CFLAGS64"
 export LDFLAGS="$LDFLAGS64"
-
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 ./configure $CONFLAGS					\
             --bindir=%{_bindir}/%{_arch64}		\
@@ -113,6 +116,10 @@
 
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
 export LDFLAGS="$LDFLAGS32"
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
 
 %endif
 %endif
@@ -191,6 +198,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Thu Oct 28 2004 - [email protected]
 - Add bonobo-slay.1, libbonobo-activation.3 man pages
 
--- a/libglade.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/libglade.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -75,6 +75,10 @@
 export CFLAGS="$CFLAGS64"
 export LDFLAGS="$LDFLAGS64"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 libtoolize --force
 aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
@@ -91,8 +95,12 @@
 
 cd ../libglade-%version
 
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="$LDFLAGS32"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
 
 %endif
 %endif
@@ -146,6 +154,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Sat Oct  2 2004 - [email protected]
 - Create 64bit libraries for Solaris
 
--- a/pango.spec	Fri Oct 29 01:25:47 2004 +0000
+++ b/pango.spec	Fri Oct 29 01:28:51 2004 +0000
@@ -89,6 +89,10 @@
 export CFLAGS="$CFLAGS64"
 export LDFLAGS="$LDFLAGS64"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH64"
+export CC=${CC64:-$CC}
+save_PATH="$PATH"
+ccdir=`dirname $CC`
+export PATH=$ccdir:$PATH
 
 ./configure $CONFLAGS					\
             --bindir=%{_bindir}/%{_arch64}		\
@@ -101,9 +105,12 @@
 
 cd ../pango-%version
 
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$CFLAGS32"
+export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="$LDFLAGS32"
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH32"
+export CC=${CC32:-$CC}
+export PATH="$save_PATH"
 
 %endif
 %endif
@@ -160,6 +167,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 29 2004 - [email protected]
+- use $CC64 for the 64-bit build if defined
+
 * Sun Oct 10 2004 - [email protected]
 - add patch pango-03-disable-script.diff to fix 5098206
       Latin font should not be used for ASCII when monospace family.
sustaining/oi_151a/spec-files