rpms/gcc/devel gcc4-java-pangoft2.patch, NONE, 1.1 .cvsignore, 1.113, 1.114 gcc4.spec, 1.81, 1.82 sources, 1.115, 1.116 gcc4-pr23818.patch, 1.1, NONE

Fri Oct 7 13:46:33 UTC 2005

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1457

Modified Files:
	.cvsignore gcc4.spec sources 
Added Files:
	gcc4-java-pangoft2.patch 
Removed Files:
	gcc4-pr23818.patch 
Log Message:
4.0.2-3


gcc4-java-pangoft2.patch:
 configure    |  101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |    4 ++
 2 files changed, 105 insertions(+)

--- NEW FILE gcc4-java-pangoft2.patch ---
2005-10-07  Jakub Jelinek  <jakub at redhat.com>

	* configure.ac (PANGOFT2): Check for pangoft2 even if
	not --enable-gtk-cairo.
	* configure: Rebuilt.

--- libjava/configure.ac.jj	2005-08-22 22:10:30.000000000 +0200
+++ libjava/configure.ac	2005-10-07 15:37:54.000000000 +0200
@@ -1004,6 +1004,10 @@ else
       AC_SUBST(LIBART_CFLAGS)
       AC_SUBST(LIBART_LIBS)
 
+      if test "x${enable_gtk_cairo}" != xyes; then
+	PKG_CHECK_MODULES(PANGOFT2, pangoft2)
+      fi
+
       # We require the XTest Extension to support java.awt.Robot.
       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
--- libjava/configure.jj	2005-08-22 22:10:30.000000000 +0200
+++ libjava/configure	2005-10-07 15:38:08.000000000 +0200
@@ -13092,6 +13092,107 @@ echo "$as_me: error: Library requirement
 
 
 
+      if test "x${enable_gtk_cairo}" != xyes; then
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for pangoft2" >&5
+echo $ECHO_N "checking for pangoft2... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "pangoft2" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking PANGOFT2_CFLAGS" >&5
+echo $ECHO_N "checking PANGOFT2_CFLAGS... $ECHO_C" >&6
+            PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
+            echo "$as_me:$LINENO: result: $PANGOFT2_CFLAGS" >&5
+echo "${ECHO_T}$PANGOFT2_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking PANGOFT2_LIBS" >&5
+echo $ECHO_N "checking PANGOFT2_LIBS... $ECHO_C" >&6
+            PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
+            echo "$as_me:$LINENO: result: $PANGOFT2_LIBS" >&5
+echo "${ECHO_T}$PANGOFT2_LIBS" >&6
+        else
+            PANGOFT2_CFLAGS=""
+            PANGOFT2_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
+            echo $PANGOFT2_PKG_ERRORS
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     { { echo "$as_me:$LINENO: error: Library requirements (pangoft2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (pangoft2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+      fi
+
       # We require the XTest Extension to support java.awt.Robot.
       echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
 echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- .cvsignore	5 Oct 2005 21:05:16 -0000	1.113
+++ .cvsignore	7 Oct 2005 13:46:29 -0000	1.114
@@ -1 +1 @@
-gcc-4.0.2-20051005.tar.bz2
+gcc-4.0.2-20051007.tar.bz2


Index: gcc4.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc4.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gcc4.spec	6 Oct 2005 13:06:36 -0000	1.81
+++ gcc4.spec	7 Oct 2005 13:46:29 -0000	1.82
@@ -1,6 +1,6 @@
-%define DATE 20051005
+%define DATE 20051007
 %define gcc_version 4.0.2
-%define gcc_release 2
+%define gcc_release 3
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} alpha ia64 x86_64 s390 sparc sparc64
@@ -93,7 +93,7 @@
 Patch11: gcc4-vsb-stack.patch
 Patch12: gcc4-libltdl-multilib.patch
 Patch13: gcc4-java-rh163099.patch
-Patch14: gcc4-pr23818.patch
+Patch14: gcc4-java-pangoft2.patch
 Patch15: gcc4-libjava-ia64-backtrace.patch
 Patch16: gcc4-stack-protector.patch
 Patch17: gcc4-ia64-stack-protector.patch
@@ -429,7 +429,7 @@
 %patch11 -p0 -b .vsb-stack~
 %patch12 -p0 -b .libltdl-multilib~
 %patch13 -p0 -b .java-rh163099~
-%patch14 -p0 -b .pr23818~
+%patch14 -p0 -b .java-pangoft2~
 %patch15 -p0 -b .libjava-ia64-backtrace~
 %patch16 -p0 -b .stack-protector~
 %patch17 -p0 -b .ia64-stack-protector~
@@ -1471,6 +1471,12 @@
 %endif
 
 %changelog
+* Fri Oct  7 2005 Jakub Jelinek  <jakub at redhat.com> 4.0.2-3
+- update from CVS
+  - PRs fortran/18568, debug/24070, middle-end/15855, target/22585,
+	target/23570
+- fix libjava configury, broken by recent gkt+-2.0 pkg-config changes
+
 * Wed Oct  5 2005 Jakub Jelinek  <jakub at redhat.com> 4.0.2-2
 - update from CVS
   - PRs ada/19382, c++/17609, c++/17775, c++/18368, c++/22621, c++/23513,
@@ -1481,8 +1487,6 @@
 	libstdc++/24054, libstdc++/24064, middle-end/23125, middle-end/24069,
 	tree-optimization/21419, tree-optimization/24146,
 	tree-optimization/24151
-- build with --enable-gtk-cairo, apparently some gtk+-2.0 pkg-config
-  changes prevent libjava building otherwise
 
 * Thu Sep 29 2005 Jakub Jelinek  <jakub at redhat.com> 4.0.2-1
 - update from CVS


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	5 Oct 2005 21:05:16 -0000	1.115
+++ sources	7 Oct 2005 13:46:29 -0000	1.116
@@ -1 +1 @@
-37d075bdd417c4d3b4dd45ab06f5ed33  gcc-4.0.2-20051005.tar.bz2
+b18786f4abe880300e2af1e0629b03c4  gcc-4.0.2-20051007.tar.bz2


--- gcc4-pr23818.patch DELETED ---


