Merge pull request #32960 from knz/backport2.1-32959

release-2.1: build: link libncurses statically
cockroachdb · Dec 10, 2018 · 8c4cd6b · 8c4cd6b
2 parents 1d5c68b + 0592ed3
commit 8c4cd6b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/build/builder.sh b/build/builder.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 image=cockroachdb/builder
-version=20181019-161416
+version=20181128-142752
 
 function init() {
   docker build --tag="${image}" "$(dirname "${0}")/builder"

diff --git a/build/builder/Dockerfile b/build/builder/Dockerfile
@@ -102,24 +102,24 @@ RUN mkdir ncurses \
        CXX=/x-tools/x86_64-unknown-linux-musl/bin/x86_64-unknown-linux-musl-c++ \
        ../configure --prefix=/x-tools/x86_64-unknown-linux-musl/x86_64-unknown-linux-musl/sysroot/usr \
          --host=x86_64-unknown-linux-musl \
-         $(cat /ncurses.conf) --without-shared --without-dlsym \
-    && (cd ncurses && make all && make install)) \
+         $(cat /ncurses.conf) \
+    && make install.libs) \
  && mkdir build-x86_64-unknown-linux-gnu \
  && (cd build-x86_64-unknown-linux-gnu \
     && CC=/x-tools/x86_64-unknown-linux-gnu/bin/x86_64-unknown-linux-gnu-cc \
        CXX=/x-tools/x86_64-unknown-linux-gnu/bin/x86_64-unknown-linux-gnu-c++ \
        ../configure --prefix=/x-tools/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/sysroot/usr \
          --host=x86_64-unknown-linux-gnu \
          $(cat /ncurses.conf) \
-    && (cd ncurses && make all && make install)) \
+    && make install.libs) \
  && mkdir build-aarch64-unknown-linux-gnueabi \
  && (cd build-aarch64-unknown-linux-gnueabi \
     && CC=/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-cc \
        CXX=/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-c++ \
        ../configure --prefix=/x-tools/aarch64-unknown-linux-gnueabi/aarch64-unknown-linux-gnueabi/sysroot/usr \
          --host=aarch64-unknown-linux-gnueabi \
          $(cat /ncurses.conf) \
-    && (cd ncurses && make all && make install)) \
+    && make install.libs) \
  && cd .. \
  && rm -rf ncurses ncurses.conf ncurses.patch
 

diff --git a/build/builder/ncurses.conf b/build/builder/ncurses.conf
@@ -1,7 +1,8 @@
 --with-abi-version=5
---with-shared
+--without-shared --without-dlsym
 --without-profile --without-debug
 --disable-rpath --enable-echo
+--enable-overwrite
 --enable-const
 --without-gpm
 --without-ada

diff --git a/pkg/cmd/publish-artifacts/main.go b/pkg/cmd/publish-artifacts/main.go
@@ -66,8 +66,6 @@ var libsRe = func() *regexp.Regexp {
 		regexp.QuoteMeta("librt.so."),
 		regexp.QuoteMeta("libpthread.so."),
 		regexp.QuoteMeta("libdl.so."),
-		regexp.QuoteMeta("libtinfo.so."),
-		regexp.QuoteMeta("libncurses.so."),
 		regexp.QuoteMeta("libm.so."),
 		regexp.QuoteMeta("libc.so."),
 		strings.Replace(regexp.QuoteMeta("ld-linux-ARCH.so."), "ARCH", ".*", -1),