[gentoo-commits] gentoo-x86 commit in dev-util/confix/files/2.2.0: ext-ac-archive.patch exeext.patch

[gentoo-commits] gentoo-x86 commit in dev-util/confix/files/2.2.0: ext-ac-archive.patch exeext.patch

[Markus Duft (mduft)]

mduft       09/11/03 17:09:00

  Added:                ext-ac-archive.patch exeext.patch
  Log:
  added live svn ebuild for upcoming confix-2.2
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.1                  dev-util/confix/files/2.2.0/ext-ac-archive.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/ext-ac-archive.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/ext-ac-archive.patch?rev=1.1&content-type=text/plain

Index: ext-ac-archive.patch
===================================================================
diff -ru confix-9999.orig/libconfix/plugins/automake/bootstrap.py confix-9999/libconfix/plugins/automake/bootstrap.py
--- confix-9999.orig/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:25:27.962172020 +0100
+++ confix-9999/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:27:14.780605001 +0100
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-import autoconf_archive
+#import autoconf_archive
 import kde_hack
 
 from libconfix.core.utils.error import Error
@@ -29,7 +29,7 @@
 
 def bootstrap(packageroot, use_kde_hack, argv0, path=None):
     aclocal_incdirs = []
-    aclocal_incdirs.append(autoconf_archive.include_path(argv0))
+    #aclocal_incdirs.append(autoconf_archive.include_path(argv0))
 
     # if package's configure.ac looks like using libtool, then we
     # assume that the package must be libtoolize'd.
diff -ru confix-9999.orig/setup.py confix-9999/setup.py
--- confix-9999.orig/setup.py	2009-10-30 13:25:27.965360137 +0100
+++ confix-9999/setup.py	2009-10-30 13:26:47.822129311 +0100
@@ -41,8 +41,8 @@
     return result
 
 datafiles = []
-datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
-datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
+#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
+#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
 
 # scripts to put in the auxdir.
 datafiles.extend([('share/confix/kde-hack',



1.1                  dev-util/confix/files/2.2.0/exeext.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/exeext.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/exeext.patch?rev=1.1&content-type=text/plain

Index: exeext.patch
===================================================================
diff -ru confix-9999.orig/libconfix/plugins/automake/makefile_am.py confix-9999/libconfix/plugins/automake/makefile_am.py
--- confix-9999.orig/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:20:42.106291175 +0100
+++ confix-9999/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:23:39.562354663 +0100
@@ -472,7 +472,15 @@
         
         # register automatic tests and set their environment
 
-        tests = self.dir_primary('check', 'PROGRAMS') + \
+        test_tmp = self.dir_primary('check', 'PROGRAMS')
+        count = 0
+        for prog in test_tmp:
+            prog += "$(EXEEXT)"
+            test_tmp[count] = prog
+            count += 1
+            pass
+
+        tests = test_tmp + \
                 self.dir_primary('check', 'SCRIPTS')
         if len(tests):
             lines.extend(makefile.List(name='TESTS', values=tests, mitigate=True).lines())