rpms/GtkAda/devel GtkAda-2.14.0-configuration-1.patch, NONE, 1.1 GtkAda.spec, 1.37, 1.38

[Björn Persson]

Author: rombobeorn

Update of /cvs/pkgs/rpms/GtkAda/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7530

Modified Files:
	GtkAda.spec 
Added Files:
	GtkAda-2.14.0-configuration-1.patch 
Log Message:
This one should build with GCC 4.5. Also fixed dependencies.

GtkAda-2.14.0-configuration-1.patch:
 aclocal.m4             |    2 +-
 configure              |    2 +-
 shared.gpr             |    7 +++++--
 src/Makefile.common.in |    2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE GtkAda-2.14.0-configuration-1.patch ---
--- /home/beorn/fedora-cvs/GtkAda/devel/GtkAda-2.14.0/aclocal.m4	2008-05-14 17:07:19.000000000 +0200
+++ aclocal.m4	2010-07-11 02:29:07.000000000 +0200
@@ -114,7 +114,7 @@
 AC_DEFUN(CHECK_BUILD_TYPE,
 [
     AC_ARG_ENABLE(build,
-                  [--enable-build=<type>       Default build type for the library (Debug, Production)],
+                  [  --enable-build=<type>   Default build type for the library (Debug, Debuginfo, Production)],
                   BUILD_TYPE=$enableval,
                   BUILD_TYPE=Production)
 ]
--- /home/beorn/fedora-cvs/GtkAda/devel/GtkAda-2.14.0/configure	2008-12-16 12:41:30.000000000 +0100
+++ configure	2010-07-11 02:28:41.000000000 +0200
@@ -807,7 +807,7 @@
   --disable-shared        Disable building of shared libraries
   --enable-shared         Build shared libraries if supported on the target
                           Make them the installation default
---enable-build=<type>       Default build type for the library (Debug, Production)
+--enable-build=<type>       Default build type for the library (Debug, Debuginfo, Production)
   --disable-nls           do not use Native Language Support
 
 Optional Packages:
--- /home/beorn/fedora-cvs/GtkAda/devel/GtkAda-2.14.0/shared.gpr	2007-09-21 04:15:49.000000000 +0200
+++ shared.gpr	2010-07-11 00:39:18.000000000 +0200
@@ -1,6 +1,6 @@
 project Shared is
 
-   type Build_Type is ("Debug", "Production");
+   type Build_Type is ("Debug", "Debuginfo", "Production");
    Build : Build_Type := external ("BUILD", "Production");
 
    type Boolean_Type is ("True", "False");
@@ -16,6 +16,9 @@
          when "Debug" =>
              for Default_Switches ("Ada") use
                 ("-gnatQ", "-gnatwae", "-gnatay", "-g", "-O1");
+         when "Debuginfo" =>
+             for Default_Switches ("Ada") use
+                ("-gnatQ", "-g", "-O2", "-gnatn", "-gnatws");
          when "Production" =>
              for Default_Switches ("Ada") use
                 ("-gnatQ", "-O2", "-gnatn", "-gnatws");
@@ -32,7 +35,7 @@
       case Build is
          when "Debug" =>
              for Default_Switches ("Ada") use ("-E");
-         when "Production" =>
+         when "Debuginfo" | "Production" =>
              null;
       end case;
    end Binder;
--- /home/beorn/fedora-cvs/GtkAda/devel/GtkAda-2.14.0/src/Makefile.common.in	2009-11-21 01:25:58.000000000 +0100
+++ src/Makefile.common.in	2010-07-11 00:10:58.000000000 +0200
@@ -95,10 +95,12 @@
 	@cd ${OBJ_DIR}; $(RM) $(LIBNAME)
 	@cd ${OBJ_DIR}; $(LN) $(SONAME) $(LIBNAME)
 ifneq (${BUILD_TYPE},Debug)
+ifneq (${BUILD_TYPE},Debuginfo)
 ifneq (${OS},Windows_NT)
 	@cd ${OBJ_DIR}; strip $(LIBNAME)
 endif
 endif
+endif
 	@cd ${OBJ_DIR}; ${CHMOD} +x ${LIBNAME}
 
 ${OBJ_DIR}/${ARCHIVENAME}: ${wildcard ${SRC_FILES:%=${OBJ_DIR}/%}}


Index: GtkAda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- GtkAda.spec	8 Jul 2010 22:03:04 -0000	1.37
+++ GtkAda.spec	11 Jul 2010 09:27:19 -0000	1.38
@@ -18,6 +18,8 @@ Patch3:         GtkAda-2.14.0-lm.patch
 # Adaptation to an addition in GTK+ 2.21, proposed upstream 2010-06-21:
 # http://lists.adacore.com/pipermail/gtkada/2010-June/003888.html
 Patch4:         GtkAda-2.14.0-GTK+-2.21.patch
+# Patch under development for a more flexible build system:
+Patch5:         GtkAda-2.14.0-configuration-1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat
@@ -100,6 +102,7 @@ Documentation for GtkAda.
 %patch2
 %patch3
 %patch4
+%patch5
 # Replace "/usr/lib" with the appropriate architecture-specific directory, but
 # make an exception for "/usr/lib/gnat". Keep "$(prefix)" so that makeinstall
 # can insert the buildroot.
@@ -112,7 +115,9 @@ find -name .cvsignore | xargs rm -fr
 # adapt opt flags to gnatmake
 GNAT_RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|--param=ssp-buffer-size=4||'`
 sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
-%configure --enable-build=Debug
+# Add missing link options to link the sub-libraries to the main library.
+sed -i "s|^\(EXTERNAL_LIBS *=\)|\1 -L../../lib-obj -lgtkada |" src/{gnome,glade,opengl}/Makefile.in
+%configure --enable-build=Debuginfo
 sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
 make incdir=%{_includedir}/gtkada alidir=%{_libdir}/gtkada
 make -C docs
@@ -205,8 +210,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Jul 08 2010 Björn Persson <bjorn at rombobjörn.se> - 2.14.0-6
-- Rebuilt with GCC 4.5.
+* Sun Jul 11 2010 Björn Persson <bjorn at rombobjörn.se> - 2.14.0-6
+- Hacked in missing link options to get the subpackages to depend on
+  the main package.
+- Implemented a better way of enabling debug information, making it
+  possible to build with GCC 4.5.
 
 * Sun Jun 27 2010 Björn Persson <bjorn at rombobjörn.se> - 2.14.0-5
 - Patched to build against GTK+ 2.21 (#599780).