diff options
author | Chris Severance | 2017-07-02 14:43:50 -0400 |
---|---|---|
committer | Chris Severance | 2017-07-02 14:43:50 -0400 |
commit | c8c6d2bc7b5dd509d2a327f5e8521d503f736a77 (patch) | |
tree | 41025b563c03d9315514cf96df2daf88d29a91e7 | |
parent | 7f5a07e7e1b43fd9edc924679145c65665770426 (diff) | |
download | aur-c8c6d2bc7b5dd509d2a327f5e8521d503f736a77.tar.gz |
Patches including for flex 2.6.2
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 39 | ||||
-rw-r--r-- | latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch | 23 | ||||
-rw-r--r-- | latrace-patch-armv7l.patch | 15 | ||||
-rw-r--r-- | latrace-patch-reproducible.patch | 8 |
5 files changed, 84 insertions, 9 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Fri Jun 10 17:25:02 UTC 2016 +# Sun Jul 2 18:42:33 UTC 2017 pkgbase = latrace pkgdesc = trace library calls and get their statistics in a manner similar to the strace utility (syscall tracing) pkgver = 0.5.11 @@ -14,7 +14,13 @@ pkgbase = latrace makedepends = docbook-xsl depends = glibc source = http://people.redhat.com/jolsa/latrace/dl/latrace-0.5.11.tar.bz2 + source = latrace-patch-armv7l.patch + source = latrace-patch-reproducible.patch + source = latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch sha256sums = 3b5afacafa8c1f9f00fb911466f4e2944162aaedfd81805f54e34c22652dbdd5 + sha256sums = 0e07f4875bff939f973717a591f632451b70f18280ed08f3ac743210bd187486 + sha256sums = 91650879c793850794d5b60cc0c481127558ce3d3485fa699081c2825ad2c92f + sha256sums = 8c793ecd3fc16a41d3ffe54beb7dde5c18dbf61dc4c3372e4728125b1a1a404a pkgname = latrace @@ -17,30 +17,53 @@ license=('GPL3') depends=('glibc') makedepends=('asciidoc' 'xmlto' 'docbook-xml' 'docbook-xsl') _verwatch=("http://people.redhat.com/jolsa/${pkgname}/download.shtml" "dl/${pkgname}-\([0-9\.]\+\)\.tar\.bz2" 'l') -source=("http://people.redhat.com/jolsa/latrace/dl/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('3b5afacafa8c1f9f00fb911466f4e2944162aaedfd81805f54e34c22652dbdd5') +source=( + "http://people.redhat.com/jolsa/latrace/dl/${pkgname}-${pkgver}.tar.bz2" + # https://lists.fedorahosted.org/archives/list/latrace@lists.fedorahosted.org/thread/DLDXFBPDNVKTV5YUYTUBMF4D4LY7XFMP/ + 'latrace-patch-armv7l.patch' + # https://build.opensuse.org/package/view_file/server:monitoring/latrace/reproducible.patch?expand=1 + 'latrace-patch-reproducible.patch' + # https://git.pengutronix.de/cgit/ptxdist/tree/patches/latrace-0.5.11 + # https://www.mail-archive.com/ptxdist@pengutronix.de/msg11703.html + #'0001-Buildsystem-fix-configure-creation.patch' + #'0002-Buildsystem-fix-cross-compilation.patch' + 'latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch' +) +sha256sums=('3b5afacafa8c1f9f00fb911466f4e2944162aaedfd81805f54e34c22652dbdd5' + '0e07f4875bff939f973717a591f632451b70f18280ed08f3ac743210bd187486' + '91650879c793850794d5b60cc0c481127558ce3d3485fa699081c2825ad2c92f' + '8c793ecd3fc16a41d3ffe54beb7dde5c18dbf61dc4c3372e4728125b1a1a404a') prepare() { set -u cd "${pkgname}-${pkgver}" - aclocal - autoconf - sed -i -e 's/CONFIG_ARCH_HAVE_TEST="y"/CONFIG_ARCH_HAVE_TEST="n"/' 'configure' - ./configure --prefix='/usr' --sysconfdir='/etc' + # diff -pu5 configure.ac{.orig,} > '/home/chris/build/latrace/latrace-patch-armv7l.patch' + patch -bup0 < '../latrace-patch-armv7l.patch' + # diff -pu3 doc/asciidoc.conf.in{.orig,} > '/home/chris/build/latrace/latrace-patch-reproducible.patch' + patch -bup0 < '../latrace-patch-reproducible.patch' + # diff -pu5 src/config-flex.l{.orig,} > '/home/chris/build/latrace/latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch' + patch -bup0 < '../latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch' set +u } build() { set -u cd "${pkgname}-${pkgver}" - make -s -j "$(nproc)" + if [ ! -s 'configure.log' ]; then + aclocal + autoconf + sed -e 's/CONFIG_ARCH_HAVE_TEST="y"/CONFIG_ARCH_HAVE_TEST="n"/' -i 'configure' + ./configure --prefix='/usr' --sysconfdir='/etc' + fi + local _nproc="$(nproc)"; _nproc=$((_nproc>4?4:_nproc)) + nice make -s -j "${_nproc}" set +u } package() { set -u cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install + make -j1 DESTDIR="${pkgdir}/" install set +u } set +u diff --git a/latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch b/latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch new file mode 100644 index 000000000000..301f4c5a96ea --- /dev/null +++ b/latrace-patch-0003-Fix-scanner-config-for-flex-2.6.x.patch @@ -0,0 +1,23 @@ +--- src/config-flex.l.orig 2011-07-25 07:18:18.000000000 -0400 ++++ src/config-flex.l 2017-07-02 13:52:20.048382500 -0400 +@@ -106,19 +106,17 @@ OPTIONS { BEGIN(options); return OPTI + <options>"\n" { NEW_LINE(); } + <options>. { ; } + + %% + +-#ifndef yywrap +-int yywrap() ++int lt_config_wrap() + { + return 1; + /* XXX not to get the compiler 'not used' warning */ + yyunput(0, NULL); + input(); + } +-#endif + + void lt_config_error(const char *m) + { + printf("conf file [%s] line %d: %s\n", + lt_inc_stack(lt_config_sinc)->file, diff --git a/latrace-patch-armv7l.patch b/latrace-patch-armv7l.patch new file mode 100644 index 000000000000..f504bcc896ac --- /dev/null +++ b/latrace-patch-armv7l.patch @@ -0,0 +1,15 @@ +--- configure.ac.orig 2011-07-25 07:18:18.000000000 -0400 ++++ configure.ac 2017-07-02 13:52:20.045049112 -0400 +@@ -73,11 +73,11 @@ AC_TYPE_INT8_T + AC_TYPE_UINT16_T + AC_TYPE_UINT8_T + AC_SYS_LARGEFILE + + date=`date "+%B %G"` +-unamem=`uname -m | sed -e 's/i.86/i686/' -e 's/^armv.*/arm/'` ++unamem=`uname -m | sed 's/i.86/i686/'` + + AC_SUBST(CONFIG_DATE, "$date") + AC_SUBST(CONFIG_SYSDEP_DIR, "$unamem") + AC_SUBST(CONFIG_VERSION, "AC_PACKAGE_VERSION") + diff --git a/latrace-patch-reproducible.patch b/latrace-patch-reproducible.patch new file mode 100644 index 000000000000..64cdf469f119 --- /dev/null +++ b/latrace-patch-reproducible.patch @@ -0,0 +1,8 @@ +--- doc/asciidoc.conf.in.orig 2011-05-15 14:24:59.000000000 -0400 ++++ doc/asciidoc.conf.in 2017-07-02 13:52:20.045049112 -0400 +@@ -2,5 +2,4 @@ + + author = Jiri Olsa + email = olsajiri@gmail.com +-date = @CONFIG_DATE@ + revision = @CONFIG_VERSION@ |