aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-10-10 17:05:11 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-10-10 20:09:55 +0200
commitd1eb423478b455e31935c238d6f17992f0e229b2 (patch)
tree8848e2a4c88c6d59ecf97371ecd691bf798978e4
parentf8026a797c467981f9598169acc2e82ed943e7f2 (diff)
downloadguix-d1eb423478b455e31935c238d6f17992f0e229b2.tar
guix-d1eb423478b455e31935c238d6f17992f0e229b2.tar.gz
gnu: strace: Update to 5.3.
* gnu/packages/patches/strace-ipc-tests.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/linux.scm (strace): Update to 5.3. [source](patches): Remove. [arguments]: Remove obsolete phase.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/linux.scm16
-rw-r--r--gnu/packages/patches/strace-ipc-tests.patch30
3 files changed, 3 insertions, 44 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 99f2cfd772..e768c3cefb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1327,7 +1327,6 @@ dist_patch_DATA = \
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
%D%/packages/patches/steghide-fixes.patch \
- %D%/packages/patches/strace-ipc-tests.patch \
%D%/packages/patches/streamlink-update-test.patch \
%D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \
%D%/packages/patches/supercollider-boost-1.70-build-fix.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e4abeadaa0..88db31ee7e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1459,18 +1459,15 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(define-public strace
(package
(name "strace")
- (version "5.2")
+ (version "5.3")
(home-page "https://strace.io")
(source (origin
(method url-fetch)
(uri (string-append home-page "/files/" version
"/strace-" version ".tar.xz"))
- ;; XXX Remove the 'regenerate-tests' phase below when
- ;; "strace-ipc-tests.patch" is no longer applied.
- (patches (search-patches "strace-ipc-tests.patch"))
(sha256
(base32
- "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"))))
+ "0ix06z4vnc49mv76f22kixz8dsh7daqv9mpgwcgl0mlnfjc124vc"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -1479,14 +1476,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(lambda _
(substitute* "strace.c"
(("/bin/sh") (which "sh")))
- #t))
- (add-before 'configure 'regenerate-tests
- ;; XXX Remove this phase when "strace-ipc-tests.patch" is no longer
- ;; applied in the 'source' field above. This phase is needed to
- ;; regenerate many other files from tests/gen_tests.in, which is
- ;; modified by the aforementioned patch.
- (lambda _
- (invoke "tests/gen_tests.sh"))))
+ #t)))
;; Don't fail if the architecture doesn't support different personalities.
#:configure-flags '("--enable-mpers=check")
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32459>.
diff --git a/gnu/packages/patches/strace-ipc-tests.patch b/gnu/packages/patches/strace-ipc-tests.patch
deleted file mode 100644
index 49341765ca..0000000000
--- a/gnu/packages/patches/strace-ipc-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix a test failure on some systems.
-
-Taken from upstream:
-https://github.com/strace/strace/commit/4377e3a1535a0ec3a42da8a1366ad6943f4efa0e
-
-diff --git a/tests/gen_tests.in b/tests/gen_tests.in
-index 4a506b94c..4fdf4722c 100644
---- a/tests/gen_tests.in
-+++ b/tests/gen_tests.in
-@@ -168,16 +168,16 @@ ipc_msg-Xabbrev +ipc.sh -Xabbrev -a26
- ipc_msg-Xraw +ipc.sh -Xraw -a16
- ipc_msg-Xverbose +ipc.sh -Xverbose -a34
- ipc_msgbuf-Xabbrev +ipc_msgbuf.test -Xabbrev
--ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a22
-+ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a20
- ipc_msgbuf-Xverbose +ipc_msgbuf.test -Xverbose
- ipc_sem +ipc.sh -a29
- ipc_sem-Xabbrev +ipc.sh -Xabbrev -a29
- ipc_sem-Xraw +ipc.sh -Xraw -a19
- ipc_sem-Xverbose +ipc.sh -Xverbose -a36
--ipc_shm +ipc.sh -a29
--ipc_shm-Xabbrev +ipc.sh -Xabbrev -a29
-+ipc_shm +ipc.sh -a26
-+ipc_shm-Xabbrev +ipc.sh -Xabbrev -a26
- ipc_shm-Xraw +ipc.sh -Xraw -a19
--ipc_shm-Xverbose +ipc.sh -Xverbose -a36
-+ipc_shm-Xverbose +ipc.sh -Xverbose -a34
- kcmp -a22
- kcmp-y -a22 -y -e trace=kcmp
- kern_features -a16