[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-33-gdf1186c
Alexander Dreyer
adreyer at gmx.de
Sat Dec 22 02:17:55 UTC 2012
The following commit has been merged in the master branch:
commit df1186cf8aaf75a42b6bb36f31827b02bb251491
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Sat Dec 22 02:59:41 2012 +0100
more generic .pc file generation
diff --git a/SConstruct b/SConstruct
index 1b181d0..1c31036 100644
--- a/SConstruct
+++ b/SConstruct
@@ -435,7 +435,8 @@ def setup_env(defaultenv):
opts.Add('CONFFILE', "Dump settings to file, if given", '')
- opts.Add('PKGCONFIGFILE', "Write settings to pkg-config file, if given", '')
+ opts.Add('PKGCONFIGPATH',
+ "Write settings to pkg-config file in path, if given", '')
opts.Add('TMPINSTALLDIR', "Temporary installation directory, if given", '')
opts.Add('PLATFORM', "Manually set another platform (unusual)",
@@ -1748,33 +1749,43 @@ if 'install' in COMMAND_LINE_TARGETS:
env.AlwaysBuild(conffile)
env.Alias('install', conffile)
- pkgconfigfilename = env['PKGCONFIGFILE']
- if pkgconfigfilename:
+ pkgconfigdirname = env['PKGCONFIGPATH']
+ if pkgconfigdirname:
def build_pcfile(target, source, env):
- from string import Template
+ localenv = source[0].get_env()
+ libflags = localenv.subst("$LINKFLAGS $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}");
+ libs = ' '.join(set([l.replace('-l','') for l in libflags.split()
+ if l.startswith('-l')]))
page = """
prefix=$PREFIX
exec_prefix=$${prefix}
includedir=$DEVEL_INCLUDE_PREFIX
libdir=$DEVEL_LIB_PREFIX
-Name: polybori
+Name: %s
Description: The PolyBoRi library
URL: http://polybori.sourceforge.net
Version: %s
-Requires: $GD_LIBS
+Requires: %s
Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
-Libs: $LINKFLAGS $SOURCES $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}
- """ % (pboriversion + '.' + pborirelease)
- page = env.subst(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
+Libs: %s
+ """ % (env.File(target[0]).name.replace('.pc',''),
+ pboriversion + '.' + pborirelease,
+ libs, libflags)
+ page = localenv.subst_target_source(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
open(str(target[0]), 'w').writelines(page)
return None
- pcfile = env.Command(pkgconfigfilename, 'SConstruct', build_pcfile)
- env.AlwaysBuild(pcfile)
- env.Alias('install', pcfile)
+ pcfiles = [env.Command(path.join(pkgconfigdirname,
+ "polybori-groebner.pc"),
+ libgbShared, build_pcfile),
+ env.Command(path.join(pkgconfigdirname,
+ "polybori.pc"), libpbShared, build_pcfile)
+ ]
+ env.AlwaysBuild(pcfiles)
+ env.Alias('install', pcfiles)
env.Alias('prepare-devel', dylibs + stlibs + readabledevellibs)
diff --git a/debian/libpolybori-dev.install b/debian/libpolybori-dev.install
index dcbfa27..1a3947a 100644
--- a/debian/libpolybori-dev.install
+++ b/debian/libpolybori-dev.install
@@ -1,4 +1,4 @@
usr/include/polybori/
usr/lib/*/*polybori.a
usr/lib/*/*polybori.so
-usr/lib/*/pkgconfig/*.pc
+usr/lib/*/pkgconfig/polybori.pc
diff --git a/debian/libpolybori-groebner-dev.install b/debian/libpolybori-groebner-dev.install
index 21a7927..f4af8aa 100644
--- a/debian/libpolybori-groebner-dev.install
+++ b/debian/libpolybori-groebner-dev.install
@@ -1,4 +1,4 @@
usr/include/polybori/groebner
usr/lib/*/*groebner*.a
usr/lib/*/*groebner*.so
-usr/lib/*/pkgconfig/*.pc
+usr/lib/*/pkgconfig/polybori-groebner.pc
diff --git a/debian/patches/0004_SConstruct.patch b/debian/patches/0004_SConstruct.patch
new file mode 100644
index 0000000..4b2dc5e
--- /dev/null
+++ b/debian/patches/0004_SConstruct.patch
@@ -0,0 +1,87 @@
+Description: Updating SConstruct
+ ... s.th. it can handle multiple .py files
+ .
+ polybori (0.8.2-1~exp1) unstable; urgency=low
+ .
+ * Updating to recent Debian standards
+Author: Alexander Dreyer <adreyer at gmx.de>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: upstream, https://bitbucket.org/brickenstein/polybori/commits/eeb1d65a951c0dfd61442bd44ab545e2068736c7
+Bug: https://bitbucket.org/brickenstein/polybori/commits/eeb1d65a951c0dfd61442bd44ab545e2068736c7
+Forwarded: already upstream.
+dddd<dddddddo|not-needed|url proving that it has been forwarded>
+Reviewed-By: Alexander Dreyer <adreyer at gmx.de>
+Last-Update: 2012-12-22
+
+--- polybori-0.8.2.orig/SConstruct
++++ polybori-0.8.2/SConstruct
+@@ -435,7 +435,8 @@ def setup_env(defaultenv):
+
+ opts.Add('CONFFILE', "Dump settings to file, if given", '')
+
+- opts.Add('PKGCONFIGFILE', "Write settings to pkg-config file, if given", '')
++ opts.Add('PKGCONFIGPATH',
++ "Write settings to pkg-config file in path, if given", '')
+ opts.Add('TMPINSTALLDIR', "Temporary installation directory, if given", '')
+
+ opts.Add('PLATFORM', "Manually set another platform (unusual)",
+@@ -1748,33 +1749,43 @@ if 'install' in COMMAND_LINE_TARGETS:
+ env.AlwaysBuild(conffile)
+ env.Alias('install', conffile)
+
+- pkgconfigfilename = env['PKGCONFIGFILE']
+- if pkgconfigfilename:
++ pkgconfigdirname = env['PKGCONFIGPATH']
++ if pkgconfigdirname:
+ def build_pcfile(target, source, env):
+- from string import Template
++ localenv = source[0].get_env()
++ libflags = localenv.subst("$LINKFLAGS $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}");
++ libs = ' '.join(set([l.replace('-l','') for l in libflags.split()
++ if l.startswith('-l')]))
+ page = """
+ prefix=$PREFIX
+ exec_prefix=$${prefix}
+ includedir=$DEVEL_INCLUDE_PREFIX
+ libdir=$DEVEL_LIB_PREFIX
+
+-Name: polybori
++Name: %s
+ Description: The PolyBoRi library
+ URL: http://polybori.sourceforge.net
+ Version: %s
+-Requires: $GD_LIBS
++Requires: %s
+ Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
+-Libs: $LINKFLAGS $SOURCES $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}
+- """ % (pboriversion + '.' + pborirelease)
+- page = env.subst(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
++Libs: %s
++ """ % (env.File(target[0]).name.replace('.pc',''),
++ pboriversion + '.' + pborirelease,
++ libs, libflags)
++ page = localenv.subst_target_source(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
+ open(str(target[0]), 'w').writelines(page)
+
+ return None
+
+- pcfile = env.Command(pkgconfigfilename, 'SConstruct', build_pcfile)
+- env.AlwaysBuild(pcfile)
+- env.Alias('install', pcfile)
++ pcfiles = [env.Command(path.join(pkgconfigdirname,
++ "polybori-groebner.pc"),
++ libgbShared, build_pcfile),
++ env.Command(path.join(pkgconfigdirname,
++ "polybori.pc"), libpbShared, build_pcfile)
++ ]
+
++ env.AlwaysBuild(pcfiles)
++ env.Alias('install', pcfiles)
+
+
+ env.Alias('prepare-devel', dylibs + stlibs + readabledevellibs)
diff --git a/debian/patches/series b/debian/patches/series
index c6741cc..9cec0a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-add-doc-Makefile-to-assist-cleaning.patch
0002-customize-library-version.patch
0003_support_pkgconfig.patch
+0004_SConstruct.patch
diff --git a/debian/rules b/debian/rules
index 6762a04..937bcc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ build-python%:
CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS)" \
LIBRARY_VERSION="1.0.0" DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
- PKGCONFIGFILE=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polybori.pc TMPINSTALLDIR=$(TMPDEST)
+ PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST)
-mkdir -p $(TMPDEST)
scons $(SCONSPARFLAGS) install devel-install INSTALLDIR=$(TMPDEST)/usr/share/polybori \
PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
@@ -43,7 +43,7 @@ build-python%:
CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS)" \
LIBRARY_VERSION="1.0.0" DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
- PKGCONFIGFILE=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polybori.pc TMPINSTALLDIR=$(TMPDEST)
+ PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST)
install-%:
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list