From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGVua-0006mF-4r for guix-patches@gnu.org; Wed, 09 May 2018 16:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGVuV-0003uZ-M4 for guix-patches@gnu.org; Wed, 09 May 2018 16:42:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47697) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGVuV-0003uV-IS for guix-patches@gnu.org; Wed, 09 May 2018 16:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fGVuV-0007Js-Au for guix-patches@gnu.org; Wed, 09 May 2018 16:42:03 -0400 Subject: [bug#31393] [PATCH 2/4] gnu: Rename "liblog" to "android-liblog". Resent-Message-ID: From: Danny Milosavljevic Date: Wed, 9 May 2018 22:41:38 +0200 Message-Id: <20180509204140.10819-2-dannym@scratchpost.org> In-Reply-To: <20180509204140.10819-1-dannym@scratchpost.org> References: <20180509203947.10746-1-dannym@scratchpost.org> <20180509204140.10819-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31393@debbugs.gnu.org * gnu/packages/android.scm (liblog): Rename to... (android-liblog): ...this. --- gnu/packages/android.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index eaae0229a..db5a00298 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -143,9 +143,9 @@ use their packages mostly unmodified in our Android NDK build system.") (base32 checksum)))) -(define liblog +(define android-liblog (package - (name "liblog") + (name "android-liblog") (version (android-platform-version)) (source (android-platform-system-core version)) (build-system android-ndk-build-system) @@ -182,7 +182,7 @@ in Main, System, Radio and Events sub-logs.") (modify-phases %standard-phases (add-after 'unpack 'enter-source (lambda _ (chdir "base") #t))))) - (inputs `(("liblog" ,liblog))) + (inputs `(("android-liblog" ,android-liblog))) (home-page "https://developer.android.com/") (synopsis "Android platform base library") (description "@code{libbase} is a library in common use by the @@ -322,7 +322,7 @@ various Android core host applications.") (inputs `(("libbase" ,libbase) ("libcutils" ,libcutils) - ("liblog" ,liblog) + ("android-liblog" ,android-liblog) ("openssl" ,openssl))) (home-page "https://developer.android.com/studio/command-line/adb.html") (synopsis "Android Debug Bridge") @@ -477,7 +477,7 @@ that is safe to use for user space. It also includes "/include " "-I " (assoc-ref %build-inputs "libcutils") "/include " - "-I " (assoc-ref %build-inputs "liblog") "/include " + "-I " (assoc-ref %build-inputs "android-liblog") "/include " "-I ../core/include") "CFLAGS=-Wno-error" "install-libext4_utils_host.a" @@ -500,7 +500,7 @@ that is safe to use for user space. It also includes #t))))) (inputs `(("libcutils" ,libcutils) - ("liblog" ,liblog) + ("android-liblog" ,android-liblog) ("android-libselinux" ,android-libselinux) ("android-libsparse" ,android-libsparse) ("zlib" ,zlib))) @@ -613,7 +613,7 @@ Android core.") ("googletest" ,googletest) ("libbase" ,libbase) ("libcutils" ,libcutils) - ("liblog" ,liblog) + ("android-liblog" ,android-liblog) ("android-libutils" ,android-libutils) ("android-libsparse" ,android-libsparse) ("android-libziparchive" ,android-libziparchive)