From 2b24faa295972e839d0ec540375eb74955264feb Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 5 Aug 2013 14:59:46 +0200 Subject: gnu: Rename "libapr" to "apr" and "libaprutil" to "apr-util". * gnu/packages/apr.scm: Rename file from libapr.scm. * gnu/packages/patches/apr-skip-getservbyname-test.patch: Rename file from libapr-skip-getservbyname-test.patch. * gnu-system.am (GNU_SYSTEM_MODULES): Rename module libapr to apr. * gnu-system.am (dist_patch_DATA): Rename patch file. * gnu/packages/apr.scm (apr): Rename from libapr. * gnu/packages/apr.scm (apr-util): Rename from libaprutil, change input name. * gnu/packages/version-control.scm (subversion): Change input name. --- gnu-system.am | 4 +- gnu/packages/apr.scm | 91 ++++++++++++++++++++++ gnu/packages/libapr.scm | 91 ---------------------- .../patches/apr-skip-getservbyname-test.patch | 25 ++++++ .../patches/libapr-skip-getservbyname-test.patch | 25 ------ gnu/packages/version-control.scm | 6 +- 6 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 gnu/packages/apr.scm delete mode 100644 gnu/packages/libapr.scm create mode 100644 gnu/packages/patches/apr-skip-getservbyname-test.patch delete mode 100644 gnu/packages/patches/libapr-skip-getservbyname-test.patch diff --git a/gnu-system.am b/gnu-system.am index bfead6efb9..6b10c8508d 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -24,6 +24,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages.scm \ gnu/packages/acl.scm \ gnu/packages/algebra.scm \ + gnu/packages/apr.scm \ gnu/packages/aspell.scm \ gnu/packages/attr.scm \ gnu/packages/autotools.scm \ @@ -87,7 +88,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/ld-wrapper.scm \ gnu/packages/less.scm \ gnu/packages/lesstif.scm \ - gnu/packages/libapr.scm \ gnu/packages/libdaemon.scm \ gnu/packages/libevent.scm \ gnu/packages/libffi.scm \ @@ -173,6 +173,7 @@ GNU_SYSTEM_MODULES = \ patchdir = $(guilemoduledir)/gnu/packages/patches dist_patch_DATA = \ + gnu/packages/patches/apr-skip-getservbyname-test.patch \ gnu/packages/patches/automake-skip-amhello-tests.patch \ gnu/packages/patches/bigloo-gc-shebangs.patch \ gnu/packages/patches/binutils-ld-new-dtags.patch \ @@ -196,7 +197,6 @@ dist_patch_DATA = \ gnu/packages/patches/guile-default-utf8.patch \ gnu/packages/patches/guile-linux-syscalls.patch \ gnu/packages/patches/guile-relocatable.patch \ - gnu/packages/patches/libapr-skip-getservbyname-test.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libtool-skip-tests.patch \ gnu/packages/patches/m4-gets-undeclared.patch \ diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm new file mode 100644 index 0000000000..01a4e6c2ba --- /dev/null +++ b/gnu/packages/apr.scm @@ -0,0 +1,91 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Cyril Roelandt +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages apr) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages perl) + #:use-module (gnu packages autotools)) + +(define-public apr + (package + (name "apr") + (version "1.4.8") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/apr/apr-" + version ".tar.bz2")) + (sha256 + (base32 + "0884csfk3f530yscak0jlr6w929s3ys0n7fpwdg3dii1sgwd5f31")))) + (build-system gnu-build-system) + (arguments + `(#:patches (list (assoc-ref %build-inputs + "patch/skip-test")) + #:patch-flags '("-p0"))) + (inputs `(("perl" ,perl) + ("libtool" ,libtool) + ("patch/skip-test" + ,(search-patch "apr-skip-getservbyname-test.patch")))) + (home-page "http://apr.apache.org/") + (synopsis "The Apache Portable Runtime Library") + (description + "The mission of the Apache Portable Runtime (APR) project is to create and +maintain software libraries that provide a predictable and consistent interface +to underlying platform-specific implementations. The primary goal is to provide +an API to which software developers may code and be assured of predictable if +not identical behaviour regardless of the platform on which their software is +built, relieving them of the need to code special-case conditions to work +around or take advantage of platform-specific deficiencies or features.") + (license asl2.0))) + +(define-public apr-util + (package + (name "apr-util") + (version "1.5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/apr/apr-util-" + version ".tar.bz2")) + (sha256 + (base32 + "19qjxpckb9p4j9pbk8kcirg6k5vqnjrqhnk9xx2c5m9964p3vkls")))) + (build-system gnu-build-system) + (inputs + `(("apr" ,apr))) + (arguments + '(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (apr (assoc-ref inputs "apr"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./configure" + (string-append "--prefix=" out) + (string-append "--with-apr=" apr))))) + %standard-phases))) + (home-page "http://apr.apache.org/") + (synopsis "One of the Apache Portable Runtime Library companions") + (description + "APR-util provides a number of helpful abstractions on top of APR.") + (license asl2.0))) diff --git a/gnu/packages/libapr.scm b/gnu/packages/libapr.scm deleted file mode 100644 index 9ace167806..0000000000 --- a/gnu/packages/libapr.scm +++ /dev/null @@ -1,91 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Cyril Roelandt -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages libapr) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages perl) - #:use-module (gnu packages autotools)) - -(define-public libapr - (package - (name "libapr") - (version "1.4.8") - (source (origin - (method url-fetch) - (uri (string-append "mirror://apache/apr/apr-" - version ".tar.bz2")) - (sha256 - (base32 - "0884csfk3f530yscak0jlr6w929s3ys0n7fpwdg3dii1sgwd5f31")))) - (build-system gnu-build-system) - (arguments - `(#:patches (list (assoc-ref %build-inputs - "patch/skip-test")) - #:patch-flags '("-p0"))) - (inputs `(("perl" ,perl) - ("libtool" ,libtool) - ("patch/skip-test" - ,(search-patch "libapr-skip-getservbyname-test.patch")))) - (home-page "http://apr.apache.org/") - (synopsis "The Apache Portable Runtime Library") - (description - "The mission of the Apache Portable Runtime (APR) project is to create and -maintain software libraries that provide a predictable and consistent interface -to underlying platform-specific implementations. The primary goal is to provide -an API to which software developers may code and be assured of predictable if -not identical behaviour regardless of the platform on which their software is -built, relieving them of the need to code special-case conditions to work -around or take advantage of platform-specific deficiencies or features.") - (license asl2.0))) - -(define-public libaprutil - (package - (name "libaprutil") - (version "1.5.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://apache/apr/apr-util-" - version ".tar.bz2")) - (sha256 - (base32 - "19qjxpckb9p4j9pbk8kcirg6k5vqnjrqhnk9xx2c5m9964p3vkls")))) - (build-system gnu-build-system) - (inputs - `(("libapr" ,libapr))) - (arguments - '(#:phases - (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libapr (assoc-ref inputs "libapr"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out) - (string-append "--with-apr=" libapr))))) - %standard-phases))) - (home-page "http://apr.apache.org/") - (synopsis "One of the Apache Portable Runtime Library companions") - (description - "APR-util provides a number of helpful abstractions on top of APR.") - (license asl2.0))) diff --git a/gnu/packages/patches/apr-skip-getservbyname-test.patch b/gnu/packages/patches/apr-skip-getservbyname-test.patch new file mode 100644 index 0000000000..e12a8eb56c --- /dev/null +++ b/gnu/packages/patches/apr-skip-getservbyname-test.patch @@ -0,0 +1,25 @@ +--- test/testsock.c 2013-01-24 06:57:21.000000000 +0100 ++++ test/testsock.c 2013-01-24 17:24:54.000000000 +0100 +@@ -90,16 +90,22 @@ + rv = apr_sockaddr_info_get(&sa, NULL, APR_UNSPEC, 0, 0, p); + APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv); + ++ /* /etc/services is not available while compiling, so apr_getservbyname ++ * will always return APR_ENOENT. */ ++#if 0 + rv = apr_getservbyname(sa, "ftp"); + APR_ASSERT_SUCCESS(tc, "Problem getting ftp service", rv); + ABTS_INT_EQUAL(tc, 21, sa->port); ++#endif + + rv = apr_getservbyname(sa, "complete_and_utter_rubbish"); + APR_ASSERT_SUCCESS(tc, "Problem getting non-existent service", !rv); + ++#if 0 + rv = apr_getservbyname(sa, "telnet"); + APR_ASSERT_SUCCESS(tc, "Problem getting telnet service", rv); + ABTS_INT_EQUAL(tc, 23, sa->port); ++#endif + } + + static apr_socket_t *setup_socket(abts_case *tc) diff --git a/gnu/packages/patches/libapr-skip-getservbyname-test.patch b/gnu/packages/patches/libapr-skip-getservbyname-test.patch deleted file mode 100644 index e12a8eb56c..0000000000 --- a/gnu/packages/patches/libapr-skip-getservbyname-test.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- test/testsock.c 2013-01-24 06:57:21.000000000 +0100 -+++ test/testsock.c 2013-01-24 17:24:54.000000000 +0100 -@@ -90,16 +90,22 @@ - rv = apr_sockaddr_info_get(&sa, NULL, APR_UNSPEC, 0, 0, p); - APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv); - -+ /* /etc/services is not available while compiling, so apr_getservbyname -+ * will always return APR_ENOENT. */ -+#if 0 - rv = apr_getservbyname(sa, "ftp"); - APR_ASSERT_SUCCESS(tc, "Problem getting ftp service", rv); - ABTS_INT_EQUAL(tc, 21, sa->port); -+#endif - - rv = apr_getservbyname(sa, "complete_and_utter_rubbish"); - APR_ASSERT_SUCCESS(tc, "Problem getting non-existent service", !rv); - -+#if 0 - rv = apr_getservbyname(sa, "telnet"); - APR_ASSERT_SUCCESS(tc, "Problem getting telnet service", rv); - ABTS_INT_EQUAL(tc, 23, sa->port); -+#endif - } - - static apr_socket_t *setup_socket(abts_case *tc) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index de6aaf8344..5059dcd5e1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -27,7 +27,7 @@ #:use-module (guix build utils) #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'guix:)) - #:use-module (gnu packages libapr) + #:use-module (gnu packages apr) #:use-module (gnu packages nano) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -77,8 +77,8 @@ from a command line or use a GUI application.") "11inl9n1riahfnbk1fax0dysm2swakzhzhpmm2zvga6fikcx90zw")))) (build-system gnu-build-system) (inputs - `(("libapr" ,libapr) - ("libaprutil" ,libaprutil) + `(("apr" ,apr) + ("apr-util" ,apr-util) ("perl" ,perl) ("python" ,python) ("sqlite" ,sqlite) -- cgit 1.4.1