From a827a4ef47c99d2c7111c2bebc273b7683694214 Mon Sep 17 00:00:00 2001 From: nyyu Date: Sat, 11 Jun 2022 14:53:44 +0200 Subject: [PATCH] remove pacman, use conf --- .drone.yml | 5 +- {pacman => conf}/makepkg.conf | 3 +- {pacman => conf}/pacman.conf | 0 pacman/PKGBUILD | 74 ---------------------- pacman/add-flto-to-LDFLAGS-for-clang.patch | 24 ------- 5 files changed, 4 insertions(+), 102 deletions(-) rename {pacman => conf}/makepkg.conf (99%) rename {pacman => conf}/pacman.conf (100%) delete mode 100644 pacman/PKGBUILD delete mode 100644 pacman/add-flto-to-LDFLAGS-for-clang.patch diff --git a/.drone.yml b/.drone.yml index 7f8e6de..c89eb5c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,11 +10,10 @@ steps: - name: repo path: /repo commands: - - sed -i 's/# REPOSITORIES/[nyyu]\nServer = https:\\/\\/archlinux.nyyu.dev\\/nyyu\nSigLevel = Never/' /etc/pacman.conf - - pacman -Syu git jq pacman-contrib pandoc-bin --noconfirm - - mv /etc/pacman.conf.pacnew /etc/pacman.conf + - cp -f conf/{makepkg,pacman}.conf /etc/ - sed -i 's/# REPOSITORIES/[nyyu]\nServer = https:\\/\\/archlinux.nyyu.dev\\/nyyu\nSigLevel = Never/' /etc/pacman.conf - sed -i 's/#PACKAGER=".*"/PACKAGER="nyyu "/' /etc/makepkg.conf + - pacman -Syu git jq pacman-contrib pandoc-bin --noconfirm - useradd build -m - "echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - chown -R build:build . diff --git a/pacman/makepkg.conf b/conf/makepkg.conf similarity index 99% rename from pacman/makepkg.conf rename to conf/makepkg.conf index e1faefc..0b290df 100644 --- a/pacman/makepkg.conf +++ b/conf/makepkg.conf @@ -43,6 +43,7 @@ CFLAGS="-march=x86-64-v2 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ -fstack-clash-protection -fcf-protection" CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" +LTOFLAGS="-flto=auto" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems MAKEFLAGS="-j8" @@ -78,7 +79,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug lto) +# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries diff --git a/pacman/pacman.conf b/conf/pacman.conf similarity index 100% rename from pacman/pacman.conf rename to conf/pacman.conf diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD deleted file mode 100644 index 406e8c9..0000000 --- a/pacman/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# vim: set ts=2 sw=2 et: -# Maintainer: - -pkgname=pacman -pkgver=6.0.1.r0.g0a6fecd0 -pkgrel=1 -pkgdesc="A library-based package manager with dependency support" -arch=('x86_64') -url="https://www.archlinux.org/pacman/" -license=('GPL') -groups=('base-devel') -depends=('bash' 'glibc' 'libarchive' 'curl' - 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring') -makedepends=('meson' 'asciidoc' 'doxygen') -checkdepends=('python' 'fakechroot') -optdepends=('perl-locale-gettext: translation support in makepkg-template') -provides=('libalpm.so') -backup=(etc/pacman.conf - etc/makepkg.conf) -options=('strip' 'debug') -validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae - 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) -source=(git+https://gitlab.archlinux.org/pacman/pacman.git#branch=release/6.0.x - add-flto-to-LDFLAGS-for-clang.patch - pacman.conf - makepkg.conf) -sha256sums=('SKIP' - '82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223' - '4aea8b8dc81188e9f195d0ac887e3a7c85d1be6545fd675f6c160623023d85b5' - '6c0fca917df610e98e19641d8ac3a9b865fb9e639f811e6f65bbb201c37d3181') - - -pkgver() { - cd pacman - - git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - -prepare() { - cd pacman - patch -Np1 -i ../add-flto-to-LDFLAGS-for-clang.patch -} - -build() { - cd pacman - - meson --prefix=/usr \ - --buildtype=plain \ - -Ddoc=enabled \ - -Ddoxygen=enabled \ - -Duse-git-version=true \ - -Dscriptlet-shell=/usr/bin/bash \ - -Dldconfig=/usr/bin/ldconfig \ - build - - meson compile -C build -} - -check() { - cd pacman - - meson test -C build -} - -package() { - cd pacman - - DESTDIR="$pkgdir" meson install -C build - - # install Arch specific stuff - install -dm755 "$pkgdir/etc" - install -m644 "$srcdir/pacman.conf" "$pkgdir/etc" - install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc" -} diff --git a/pacman/add-flto-to-LDFLAGS-for-clang.patch b/pacman/add-flto-to-LDFLAGS-for-clang.patch deleted file mode 100644 index b3c139d..0000000 --- a/pacman/add-flto-to-LDFLAGS-for-clang.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 26ee6ff6adbcd8560ec3a65cf219d2ab98edb804 Mon Sep 17 00:00:00 2001 -From: Allan McRae -Date: Fri, 24 Dec 2021 17:59:32 +1000 -Subject: [PATCH] LTO: Add -flto to LDFLAGS for clang - -GCC automatically detects when it is linking LTO objects, but clang does -not. Add -flto to LDFLAGS to make this work for clang too. - -Signed-off-by: Allan McRae ---- - scripts/libmakepkg/buildenv/lto.sh.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in -index 1f1ca53f..c3bd0fa4 100644 ---- a/scripts/libmakepkg/buildenv/lto.sh.in -+++ b/scripts/libmakepkg/buildenv/lto.sh.in -@@ -33,5 +33,6 @@ buildenv_lto() { - if check_option "lto" "y"; then - CFLAGS+=" -flto" - CXXFLAGS+=" -flto" -+ LDFLAGS+=" -flto" - fi - }