diff options
Diffstat (limited to 'repo/devel')
-rw-r--r-- | repo/devel/autoconf2-13.xibuild | 6 | ||||
-rw-r--r-- | repo/devel/docbook-dtd.xibuild | 9 | ||||
-rw-r--r-- | repo/devel/docbook-xml.xibuild | 106 | ||||
-rw-r--r-- | repo/devel/docbook-xsl.xibuild | 39 | ||||
-rw-r--r-- | repo/devel/docbook4-xml.xibuild | 43 | ||||
-rw-r--r-- | repo/devel/flex.xibuild | 2 | ||||
-rw-r--r-- | repo/devel/git.xibuild | 2 | ||||
-rw-r--r-- | repo/devel/llvm.xibuild | 2 | ||||
-rw-r--r-- | repo/devel/rustc.xibuild | 81 |
9 files changed, 154 insertions, 136 deletions
diff --git a/repo/devel/autoconf2-13.xibuild b/repo/devel/autoconf2-13.xibuild index 2bd4e7c..abddc17 100644 --- a/repo/devel/autoconf2-13.xibuild +++ b/repo/devel/autoconf2-13.xibuild @@ -13,8 +13,8 @@ DESC="GNU programs for producing shell scripts that can automatically configure prepare() { patch -Np1 -i autoconf-2.13-consolidated_fixes-1.patch && - mv -v autoconf.texi autoconf213.texi && - rm -v autoconf.info + mv autoconf.texi autoconf213.texi && + rm autoconf.info } @@ -25,6 +25,6 @@ build () { package () { make DESTDIR=$PKG_DEST install - install -v -m644 autoconf213.info $PKG_DEST/usr/share/info && + install -m644 autoconf213.info $PKG_DEST/usr/share/info && install-info --info-dir=$PKG_DEST/usr/share/info autoconf213.info } diff --git a/repo/devel/docbook-dtd.xibuild b/repo/devel/docbook-dtd.xibuild index f6d4394..96519c4 100644 --- a/repo/devel/docbook-dtd.xibuild +++ b/repo/devel/docbook-dtd.xibuild @@ -32,4 +32,13 @@ PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd" -- End Single Major Version catalog changes -- EOF +} + +postinstall () { + install-catalog --add /etc/sgml/sgml-docbook-dtd-$PKG_VER.cat \ + /usr/share/sgml/docbook/sgml-dtd-$PKG_VER/catalog && + + install-catalog --add /etc/sgml/sgml-docbook-dtd-$PKG_VER.cat \ + /etc/sgml/sgml-docbook.cat } + diff --git a/repo/devel/docbook-xml.xibuild b/repo/devel/docbook-xml.xibuild index 2f54184..cf119ad 100644 --- a/repo/devel/docbook-xml.xibuild +++ b/repo/devel/docbook-xml.xibuild @@ -15,115 +15,117 @@ package () { install -dm755 $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5 && install -m644 tools/db4-upgrade.xsl \ $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5 - - mkdir -p $PKG_DEST/etc/xml - xmlcatalog --noout --create $PKG_DEST/etc/xml/docbook-$PKG_VER && +} + +postinstall () { + mkdir -p /etc/xml + if [ ! -e /etc/xml/docbook-$PKG_VER ]; then + xmlcatalog --noout --create /etc/xml/docbook-$PKG_VER + fi && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbook.rng" \ - "file:/$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/rng/docbook.rng" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbookxi.rng" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rng" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbook.rnc" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/rng/docbook.rnc" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbookxi.rnc" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rnc" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/sch/docbook.sch" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER && + "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \ + /etc/xml/docbook-$PKG_VER && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/sch/docbook.sch" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \ - $PKG_DEST/etc/xml/docbook-$PKG_VER - + "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \ + /etc/xml/docbook-$PKG_VER - xmlcatalog --noout --create $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \ - "docbook.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \ - "docbook.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \ - "docbookxi.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \ - "docbookxi.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.rnc" \ - "docbook.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.rnc" \ - "docbook.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \ - "docbookxi.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && + "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \ - "docbookxi.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml - xmlcatalog --noout --create $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml && + "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml + xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://docbook.org/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \ - "docbook.schemas/sch" $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml && + "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml && xmlcatalog --noout --add "uri" \ "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \ - "docbook.schemas/sch" $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml + "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml - - if [ ! -e $PKG_DEST/etc/xml/catalog ]; then - xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog + if [ ! -e /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog fi && xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML $PKG_VER//EN" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ - $PKG_DEST/etc/xml/catalog && + "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateSystem" \ "http://docbook.org/xml/$PKG_VER/dtd/" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ - $PKG_DEST/etc/xml/catalog && + "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateURI" \ "http://docbook.org/xml/$PKG_VER/dtd/" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ - $PKG_DEST/etc/xml/catalog && + "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateURI" \ "http://docbook.org/xml/$PKG_VER/rng/" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml" \ - $PKG_DEST/etc/xml/catalog && + "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateURI" \ "http://docbook.org/xml/$PKG_VER/sch/" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml" \ - $PKG_DEST/etc/xml/catalog && + "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateURI" \ "http://docbook.org/xml/$PKG_VER/xsd/" \ - "file://$PKG_DEST/usr/share/xml/docbook/schema/xsd/$PKG_VER/catalog.xml" \ - $PKG_DEST/etc/xml/catalog - + "file:///usr/share/xml/docbook/schema/xsd/$PKG_VER/catalog.xml" \ + /etc/xml/catalog } + diff --git a/repo/devel/docbook-xsl.xibuild b/repo/devel/docbook-xsl.xibuild index 18af313..f5d576d 100644 --- a/repo/devel/docbook-xsl.xibuild +++ b/repo/devel/docbook-xsl.xibuild @@ -33,39 +33,42 @@ package () { $PKG_DEST/usr/share/doc/docbook-xsl-nons-$PKG_VER - if [ ! -d $PKG_DEST/etc/xml ]; then install -m755 -d $PKG_DEST/etc/xml; fi && - if [ ! -f $PKG_DEST/etc/xml/catalog ]; then - xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog + } + +postinstall () { + if [ ! -d /etc/xml ]; then install -m755 -d /etc/xml; fi && + if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog fi && xmlcatalog --noout --add "rewriteSystem" \ - "https://cdn.docbook.org/release/xsl-nons/$PKG_VER" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \ - $PKG_DEST/etc/xml/catalog && + "https://cdn.docbook.org/release/xsl-nons/1.79.2" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ - "https://cdn.docbook.org/release/xsl-nons/$PKG_VER" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \ - $PKG_DEST/etc/xml/catalog && + "https://cdn.docbook.org/release/xsl-nons/1.79.2" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog && xmlcatalog --noout --add "rewriteSystem" \ "https://cdn.docbook.org/release/xsl-nons/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \ - $PKG_DEST/etc/xml/catalog && + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ "https://cdn.docbook.org/release/xsl-nons/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \ - $PKG_DEST/etc/xml/catalog && + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog && xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \ - $PKG_DEST/etc/xml/catalog && + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \ - $PKG_DEST/etc/xml/catalog - + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog } + diff --git a/repo/devel/docbook4-xml.xibuild b/repo/devel/docbook4-xml.xibuild index 34313f0..b29b7ef 100644 --- a/repo/devel/docbook4-xml.xibuild +++ b/repo/devel/docbook4-xml.xibuild @@ -14,73 +14,74 @@ package () { cp -af docbook.cat *.dtd ent/ *.mod \ $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5 + } - if [ ! -e $PKG_DEST/etc/xml/docbook ]; then - xmlcatalog --noout --create $PKG_DEST/etc/xml/docbook +postinstall () { + if [ ! -e /etc/xml/docbook ]; then + xmlcatalog --noout --create /etc/xml/docbook fi && xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.5//EN" \ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.5" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - $PKG_DEST/etc/xml/docbook && + /etc/xml/docbook && xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.5" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - $PKG_DEST/etc/xml/docbook - - if [ ! -e $PKG_DEST/etc/xml/catalog ]; then - xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog + /etc/xml/docbook + if [ ! -e /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog fi && xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ "file:///etc/xml/docbook" \ - $PKG_DEST/etc/xml/catalog && + /etc/xml/catalog && xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ "file:///etc/xml/docbook" \ - $PKG_DEST/etc/xml/catalog && + /etc/xml/catalog && xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook" \ - $PKG_DEST/etc/xml/catalog && + /etc/xml/catalog && xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook" \ - $PKG_DEST/etc/xml/catalog - + /etc/xml/catalog } + diff --git a/repo/devel/flex.xibuild b/repo/devel/flex.xibuild index 1700c0c..623f963 100644 --- a/repo/devel/flex.xibuild +++ b/repo/devel/flex.xibuild @@ -18,7 +18,7 @@ check () { package () { make DESTDIR=$PKG_DEST install - ln -sv flex $PKG_DEST/usr/bin/lex + ln -s flex $PKG_DEST/usr/bin/lex } diff --git a/repo/devel/git.xibuild b/repo/devel/git.xibuild index 175aa13..4cf143f 100644 --- a/repo/devel/git.xibuild +++ b/repo/devel/git.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="grep python make xmlto" -DEPS="curl perl libressl pcre grep shadow zlib openssh" +DEPS="curl perl libressl pcre2 grep shadow zlib openssh" PKG_VER=2.34.1 SOURCE=https://www.kernel.org/pub/software/scm/git/git-$PKG_VER.tar.xz diff --git a/repo/devel/llvm.xibuild b/repo/devel/llvm.xibuild index be70e9d..134a994 100644 --- a/repo/devel/llvm.xibuild +++ b/repo/devel/llvm.xibuild @@ -24,6 +24,7 @@ build () { -DLLVM_ENABLE_RTTI=ON \ -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \ -DLLVM_BUILD_TESTS=ON \ + -DLLVM_INSTALL_UTILS=ON \ -DLLVM_BINUTILS_INCDIR=/usr/include \ -Wno-dev -G Ninja .. && ninja @@ -31,5 +32,4 @@ build () { package () { DESTDIR=$PKG_DEST ninja install - } diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild index e575ec7..0aadc6b 100644 --- a/repo/devel/rustc.xibuild +++ b/repo/devel/rustc.xibuild @@ -11,51 +11,54 @@ prepare () { mkdir -p $PKG_DEST/opt/rustc-$PKG_VER && ln -sf rustc-$PKG_VER $PKG_DEST/opt/rustc - cat > config.toml << EOF -# see config.toml.example for more possible options -[llvm] + openssl_file=vendor/openssl-sys/build/main.rs + checksum_before=$(sha256sum $openssl_file | cut -d' ' -f1) + sed -i "240i (3, 4, _) => ('3', '4', 'x')," $openssl_file + checksum_after=$(sha256sum $openssl_file | cut -d' ' -f1) + echo "checksum before: $checksum_before" + echo "checksum after: $checksum_after" -# use ninja -ninja = true + sed -i "s/$checksum_before/$checksum_after/g" vendor/openssl-sys/.cargo-checksum.json -targets = "X86" -# When compiling LLVM, the experimental targets (WebAssembly -# and RISCV) are built by default - omit them -experimental-targets = "" - -[build] -# omit HTML docs to save time and space (comment this to build them) -docs = false - -# install cargo as well as rust -extended = true - -[install] -# Adjust the prefix for the desired destination -#prefix = "/usr" -prefix = "/opt/rustc-$PKG_VER" - -# docdir is used even if the full awesome docs are not installed -docdir = "share/doc/rustc-$PKG_VER" - -[rust] -channel = "stable" -rpath = false - -codegen-tests = false - -# get a trace if there is an Internal Compiler Exception -backtrace-on-ice = true - -[target.x86_64-unknown-linux-musl] -llvm-config = "/usr/bin/llvm-config" - -EOF } build () { export RUSTFLAGS="$RUSTFLAGS -C link-arg=-lffi" && - python3 ./x.py build --exclude src/tools/miri + target=x86_64-unknown-linux-musl + build=x86_64-unknown-linux-musl + ./configure \ + --build="$build" \ + --host="$target" \ + --target="$target" \ + --prefix="/usr" \ + --release-channel="stable" \ + --llvm-root="/usr/lib/" \ + --disable-docs \ + --enable-extended \ + --tools="analysis,cargo,src,rustfmt" \ + --enable-llvm-link-shared \ + --enable-option-checking \ + --enable-locked-deps \ + --enable-vendor \ + --set="rust.musl-root=/usr" \ + --set="rust.codegen-units=1" \ + --set="rust.codegen-units-std=1" \ + --set="rust.parallel-compiler=false" \ + --set="target.$target.llvm-config=/usr/bin/llvm-config" \ + --set="target.$target.musl-root=/usr" \ + --set="target.$target.crt-static=false" \ + --set="target.$target.cc=gcc" \ + --set="target.$target.cxx=c++" \ + --set="target.$target.ar=ar" \ + --set="target.$target.linker=gcc" \ + --set="target.$build.musl-root=/usr" \ + --set="target.$build.crt-static=false" \ + --set="target.$build.cc=gcc" \ + --set="target.$build.cxx=c++" \ + --set="target.$build.ar=ar" \ + --set="target.$build.linker=gcc" + + python ./x.py dist --jobs $JOBS } |