[arch-commits] Commit in android-tools/trunk (PKGBUILD fix_build_core.patch)

[Anatol Pomozov]

    Date: Wednesday, September 18, 2019 @ 18:31:09
  Author: anatolik
Revision: 511091

Use pkgrel for adb/fastboot version, drop useless distro suffix

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/fix_build_core.patch

----------------------+
 PKGBUILD             |    4 ++--
 fix_build_core.patch |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-18 18:28:10 UTC (rev 511090)
+++ PKGBUILD	2019-09-18 18:31:09 UTC (rev 511091)
@@ -38,12 +38,12 @@
           'SKIP'
           'SKIP'
           'afca7974ad8658e52fd028ead12ad0a959d63273'
-          'e7f02cd6529dad54b4bdfd35e34b2cb9cb70cdd4'
+          '6f3d6ca9112b0f2b3049febb46cf311ddc883567'
           '2b57a4cf8012473c1a4fc6adae16573756272b02'
           '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
-  PLATFORM_TOOLS_VERSION="$pkgver" LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > build.ninja
+  PLATFORM_TOOLS_VERSION="$pkgver-$pkgrel" LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > build.ninja
 
   cd "$srcdir"/core
   patch -p1 < ../fix_build_core.patch

Modified: fix_build_core.patch
===================================================================
--- fix_build_core.patch	2019-09-18 18:28:10 UTC (rev 511090)
+++ fix_build_core.patch	2019-09-18 18:31:09 UTC (rev 511091)
@@ -16,7 +16,7 @@
      return android::base::StringPrintf(
          "Android Debug Bridge version %d.%d.%d\n"
 -        "Version %s-%s\n"
-+        "Version %s-ArchLinux\n"
++        "Version %s\n"
          "Installed as %s\n",
          ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION,
 -        PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(),
@@ -71,7 +71,7 @@
                  setvbuf(stderr, nullptr, _IONBF, 0);
              } else if (name == "version") {
 -                fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str());
-+                fprintf(stdout, "fastboot version %s-ArchLinux\n", PLATFORM_TOOLS_VERSION);
++                fprintf(stdout, "fastboot version %s\n", PLATFORM_TOOLS_VERSION);
                  fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str());
                  return 0;
  #if !defined(_WIN32)