Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pisilinux/core

Browse Source
This commit is contained in:
ayhanyalcinsoy
2016-04-03 23:41:06 +03:00
parent 947c7a7d9c 3885f68c0f
commit e84b4d0e12
9 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/glib2/pspec.xml
+1
View File
@@ -46,6 +46,7 @@
<Path fileType="data">/usr/share/glib-2.0</Path>
<Path fileType="data">/usr/share/systemtap</Path>
<Path fileType="data">/usr/share/glib-2.0/schemas</Path>
<Path fileType="data">/usr/share/gettext</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/profile.d/glib2.sh">glib2.sh</AdditionalFile>
system/base/kmod/pspec.xml
+8 -5
View File
@@ -17,15 +17,13 @@
<BuildDependencies>
<Dependency>chrpath</Dependency>
<!--<Dependency>libxslt</Dependency>-->
<Dependency>xz-32bit</Dependency>
<Dependency>xz-devel</Dependency>
<Dependency>zlib-32bit</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">kmod-15-dynamic-kmod.patch</Patch>
</Patches>
<Patches>
<Patch level="1">kmod-15-dynamic-kmod.patch</Patch>
</Patches>
</Source>
<Package>
@@ -96,6 +94,11 @@
<PartOf>emul32</PartOf>
<Summary>32bit libraries of libkmod</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>xz-32bit</Dependency>
<Dependency>zlib-32bit</Dependency>
<Dependency>glibc-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>xz-32bit</Dependency>
<Dependency>zlib-32bit</Dependency>
system/base/openssl/actions.py
+6 -1
View File
@@ -25,7 +25,12 @@ def setup():
shelltools.export("CXX", "%s -m32" % get.CXX())
shelltools.system("./Configure linux-elf %s" % options)
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
elif get.ARCH() == "i686":
shelltools.system("./Configure linux-elf %s" % options)
pisitools.dosed("Makefile", "^(SHARED_LDFLAGS=).*", "\\1 ${LDFLAGS}")
pisitools.dosed("Makefile", "^(CFLAG=.*)", "\\1 ${CFLAGS}")
else:
options += " enable-ec_nistp_64_gcc_128"
shelltools.system("./Configure linux-x86_64 %s" % options)
system/base/pisi/files/pisi.conf-i686
+1 -1
View File
@@ -13,7 +13,7 @@ fallback = http://source.pisilinux.org/1.0
generateDebug = False
jobs = -j5
ldflags = -Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu -Wl,--as-needed -Wl,--sort-common
ignored_build_types = emul32
ignored_build_types = emul32,_emul32
[directories]
cache_root_dir = /var/cache/pisi
system/base/readline/pspec.xml
+1 -3
View File
@@ -41,9 +41,6 @@
<Name>readline-devel</Name>
<PartOf>system.devel</PartOf>
<Summary>Development files for readline</Summary>
<BuildDependencies>
<Dependency>glibc-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="current">readline</Dependency>
</RuntimeDependencies>
@@ -60,6 +57,7 @@
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>ncurses-32bit</Dependency>
<Dependency>glibc-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="current">readline</Dependency>
system/base/util-linux/pspec.xml
+3 -1
View File
@@ -22,7 +22,6 @@
<Dependency>shadow</Dependency>
<Dependency>ncurses-devel</Dependency>
<Dependency>libcap-ng-devel</Dependency>
<Dependency>glibc-32bit</Dependency>
<!-- <Dependency releaseFrom="2">utempter-devel</Dependency>-->
</BuildDependencies>
<Patches>
@@ -128,6 +127,9 @@
<PartOf>emul32</PartOf>
<Summary>32-bit shared libraries for libutil-linux</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>glibc-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>glibc-32bit</Dependency>
</RuntimeDependencies>
system/devel/binutils/pspec.xml
-18
View File
@@ -13,24 +13,6 @@
<Summary>Assembler and linker tools</Summary>
<Description>Contains commands like as, ld, nm, objdump, ar, ranlib for compiling assembly code to the machine language, and for linking and manipulating the binary object files.</Description>
<Archive sha1sum="a637508cffeb2323b14bc8dd65378819768ad4ff" type="tarbz2">http://ftp.gnu.org/gnu/binutils/binutils-2.26.tar.bz2</Archive>
<Patches>
<!--Patch>binutils-2.25-roundup.patch</Patch>
<Patch>binutils-2.24-lto-testsuite.patch</Patch>
<Patch>binutils-2.24-gold-testsuite-plugin.patch</Patch>
<Patch>binutils-2.24-shared-pie.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8484.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8485.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8501.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8502.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8503.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8504.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8737.patch</Patch>
<Patch>binutils-2.24-CVE-2014-8738.patch</Patch>
<Patch>binutils-2.24-strings-all-default.patch</Patch>-->
</Patches>
<BuildDependencies>
<Dependency>glibc-32bit</Dependency>
</BuildDependencies>
</Source>
<Package>
system/devel/gobject-introspection/actions.py
+1 -1
View File
@@ -11,7 +11,7 @@ from pisi.actionsapi import get
def setup():
autotools.autoreconf("-fiv")
#autotools.autoreconf("-fiv")
autotools.configure("--disable-static \
--disable-doctool")
system/devel/gobject-introspection/pspec.xml
+2 -1
View File
@@ -21,7 +21,8 @@
<Dependency>libffi-devel</Dependency>
<Dependency>python-devel</Dependency>
<!--<Dependency>python-mako</Dependency>--><!--for enable-doctool-->
<Dependency versionFrom="2.44.0">glib2-devel</Dependency>
<Dependency versionFrom="2.46.2">glib2-devel</Dependency>
<Dependency>chrpath</Dependency>
</BuildDependencies>
</Source>