* Moved helpers, common and triggers dirs into xbps-src, where they belong. * Renamed the templates dir to srcpkgs, it was so redundant before. * Make it possible to add subpkgs with no restriction in names, for example udev now has a subpkgs called "libgudev". Previously subpkgs were named "${sourcepkg}-${pkgname}". * xbps-src: changed to look for template files in current directory. That means that most arguments from the targets have been removed. * xbps-src: added a reinstall target, to remove + install. * xbps-src: do not overwrite binpkgs by default, skip them. And more that I forgot because it's a mega-commit that I've been working for some days already... --HG-- extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
--- setup.py 2008-04-22 12:12:24.613554757 +0300
|
|
+++ setup.py 2008-04-22 12:13:09.276544063 +0300
|
|
@@ -1035,18 +1035,15 @@
|
|
#
|
|
# More information on Expat can be found at www.libexpat.org.
|
|
#
|
|
- expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
|
|
- define_macros = [
|
|
- ('HAVE_EXPAT_CONFIG_H', '1'),
|
|
- ]
|
|
+ # Use system expat
|
|
+ expatinc = '/usr/include'
|
|
+ define_macros = []
|
|
|
|
exts.append(Extension('pyexpat',
|
|
define_macros = define_macros,
|
|
include_dirs = [expatinc],
|
|
+ libraries = ['expat'],
|
|
sources = ['pyexpat.c',
|
|
- 'expat/xmlparse.c',
|
|
- 'expat/xmlrole.c',
|
|
- 'expat/xmltok.c',
|
|
],
|
|
))
|
|
|
|
@@ -1058,6 +1055,7 @@
|
|
exts.append(Extension('_elementtree',
|
|
define_macros = define_macros,
|
|
include_dirs = [expatinc],
|
|
+ libraries = ['expat'],
|
|
sources = ['_elementtree.c'],
|
|
))
|
|
|