SF.net SVN: gar:[22696] csw/mgar/pkg/cppunit/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Sun Dec 15 20:50:48 CET 2013


Revision: 22696
          http://sourceforge.net/p/gar/code/22696
Author:   dmichelsen
Date:     2013-12-15 19:50:46 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
cppunit/trunk: Some last fixes

Modified Paths:
--------------
    csw/mgar/pkg/cppunit/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch

Modified: csw/mgar/pkg/cppunit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cppunit/trunk/Makefile	2013-12-14 17:21:51 UTC (rev 22695)
+++ csw/mgar/pkg/cppunit/trunk/Makefile	2013-12-15 19:50:46 UTC (rev 22696)
@@ -18,7 +18,8 @@
 #   http://sourceforge.net/tracker/?func=detail&aid=3483400&group_id=11795&atid=111795
 PATCHFILES += cppunit-1.12.1-configure.in-fabs.patch
 
-PATCHFILES += cppunit-1.12.1-configure.in-config-headers.patch
+# Replace really outdated macros
+PATCHFILES += 0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch
 
 PACKAGES += CSWlibcppunit1-12-1
 SPKG_DESC_CSWlibcppunit1-12-1 = C++ port of JUnit, libcppunit-1.12.so.1
@@ -29,7 +30,7 @@
 PACKAGES += CSWcppunit-dev
 SPKG_DESC_CSWcppunit-dev = Development files C++ port of JUnit
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibcppunit1-12-1-gxx
+RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibcppunit1-12-1
 RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibstdc++6
 
@@ -42,6 +43,6 @@
 
 include gar/category.mk
 
-post-patch-modulated:
+post-patch:
 	cd $(WORKSRC) && autoreconf -fi
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch
===================================================================
--- csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch	                        (rev 0)
+++ csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch	2013-12-15 19:50:46 UTC (rev 22696)
@@ -0,0 +1,27 @@
+From d6fd9b4906bd5dd637e01d8b619c1e63f32a33ec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Dec 2013 18:20:48 +0100
+Subject: [PATCH] Replace macro which is so deprecated that its use is an error
+ now
+
+---
+ configure.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 564d2d6..f22dbbb 100644
+--- a/configure.in
++++ b/configure.in
+@@ -36,8 +36,7 @@ AC_SUBST(LT_CURRENT)
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+ 
+-AC_CONFIG_AUX_DIR(config)
+-AM_CONFIG_HEADER(config/config.h)
++AC_CONFIG_HEADERS([config/config.h])
+ AM_INIT_AUTOMAKE(cppunit, $CPPUNIT_VERSION)
+ 
+ # General "with" options
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list