Carl Smedstad pushed to branch main at Arch Linux / Packaging / Packages / ascii
Commits:
8cf50a68 by Carl Smedstad at 2024-09-06T21:17:24+02:00
upgpkg: 3.30-2: Set build flags without patching
Co-authored-by: @loqs
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − respect-cflags-and-ldflags.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,14 +1,12 @@
pkgbase = ascii
pkgdesc = Utility for conversion between various byte representations
and the ASCII character table
pkgver = 3.30
- pkgrel = 1
+ pkgrel = 2
url = http://www.catb.org/~esr/ascii
arch = x86_64
license = BSD-2-Clause
depends = glibc
source =
ascii-3.30.tar.gz::http://www.catb.org/~esr/ascii/ascii-3.30.tar.gz
- source = respect-cflags-and-ldflags.patch
sha512sums =
1096afac6aaa043c4ecf7f3f9a010edcec3caefc980fd44a3e613aad579d838f5be0fc6a31bb3fdd680a102885f34fcf3cd5ea50739ef134e9eb929a18e7fdce
- sha512sums =
0ea22d5c329d0226eba855d6bacc93ee49fd527ac9f8873eb892cf3f42f429938d19d47c9d40ca301e31c915516f6054ee4836fcd3116afdebf8e7e8a0577983
pkgname = ascii
=====================================
PKGBUILD
=====================================
@@ -1,31 +1,23 @@
-# Maintainer : Christian Rebischke <[email protected]>
+# Maintainer: Christian Rebischke <[email protected]>
+# Maintainer: Carl Smedstad <[email protected]>
# Contributor: Peter Lewis <[email protected]>
# Contributor: Grigorios Bouzakis <[email protected]>
# Contributor: Damir Perisa <[email protected]>
pkgname=ascii
pkgver=3.30
-pkgrel=1
+pkgrel=2
pkgdesc="Utility for conversion between various byte representations and the
ASCII character table"
arch=('x86_64')
url='http://www.catb.org/~esr/ascii'
license=('BSD-2-Clause')
depends=('glibc')
-source=(
- "$pkgname-$pkgver.tar.gz::$url/$pkgname-$pkgver.tar.gz"
- "respect-cflags-and-ldflags.patch"
-)
-sha512sums=('1096afac6aaa043c4ecf7f3f9a010edcec3caefc980fd44a3e613aad579d838f5be0fc6a31bb3fdd680a102885f34fcf3cd5ea50739ef134e9eb929a18e7fdce'
-
'0ea22d5c329d0226eba855d6bacc93ee49fd527ac9f8873eb892cf3f42f429938d19d47c9d40ca301e31c915516f6054ee4836fcd3116afdebf8e7e8a0577983')
-
-prepare() {
- cd "$pkgname-$pkgver"
- patch -Np1 -i "$srcdir/respect-cflags-and-ldflags.patch"
-}
+source=("$pkgname-$pkgver.tar.gz::$url/$pkgname-$pkgver.tar.gz")
+sha512sums=('1096afac6aaa043c4ecf7f3f9a010edcec3caefc980fd44a3e613aad579d838f5be0fc6a31bb3fdd680a102885f34fcf3cd5ea50739ef134e9eb929a18e7fdce')
build() {
cd "$pkgname-$pkgver"
- make
+ make CFLAGS="$CFLAGS $LDFLAGS"
}
package() {
=====================================
respect-cflags-and-ldflags.patch deleted
=====================================
@@ -1,21 +0,0 @@
-diff --unified --recursive --text --new-file ascii-3.30.orig/Makefile
ascii-3.30/Makefile
---- ascii-3.30.orig/Makefile 2024-08-11 02:32:05.170254380 +0200
-+++ ascii-3.30/Makefile 2024-08-11 02:35:46.214135093 +0200
-@@ -5,7 +5,7 @@
-
- VERS=$(shell sed -n <NEWS.adoc '/^[0-9]/s/:.*//p' | head -1)
-
--CFLAGS = -O
-+CFLAGS ?= -O
-
- PREFIX = /usr/local
-
-@@ -15,7 +15,7 @@
- all: ascii ascii.1
-
- ascii: ascii.c splashscreen.h nametable.h
-- $(CC) $(CFLAGS) -DREVISION='"$(VERS)"' ascii.c -o ascii
-+ $(CC) $(CFLAGS) $(LDFLAGS) -DREVISION='"$(VERS)"' ascii.c -o ascii
-
- splashscreen.h: splashscreen
- sed <splashscreen >splashscreen.h \
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/ascii/-/commit/8cf50a68d6c11a9ab59b126bb51cffe41afe76d5
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/ascii/-/commit/8cf50a68d6c11a9ab59b126bb51cffe41afe76d5
You're receiving this email because of your account on gitlab.archlinux.org.
