diff options
| author | Jonas Schnelli <[email protected]> | 2019-01-18 19:49:46 -1000 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2019-01-18 19:50:01 -1000 |
| commit | f55808ad6939607c6efb79e9b3604140498c6042 (patch) | |
| tree | cf3fc2f7a26e09a35e567feae75c134f733e0f41 | |
| parent | Merge #15101: gui: Add WalletController (diff) | |
| parent | build: Drop macports support (diff) | |
| download | discoin-f55808ad6939607c6efb79e9b3604140498c6042.tar.xz discoin-f55808ad6939607c6efb79e9b3604140498c6042.zip | |
Merge #15175: build: Drop macports support
4e81438f6 build: Drop macports support (Ben Woosley)
Pull request description:
It's unmaintained, according to @theuni.
https://github.com/bitcoin/bitcoin/pull/14920/files#r246964938
Alternative is to put it under CI. I don't have a strong opinion on this, opened for separate consideration.
Tree-SHA512: 65f8bf2bd5351f0907c25fad781a692b4cdcfc9a8b7d8e32329f53e3be64b06f9eb1b74339cfc4be6b80584f4d2bda340d70168013fcf048236267e8e2ccbf27
| -rw-r--r-- | configure.ac | 11 | ||||
| -rwxr-xr-x | contrib/macdeploy/macdeployqtplus | 6 |
2 files changed, 0 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index e1c265f10..c4b1d63bf 100644 --- a/configure.ac +++ b/configure.ac @@ -511,17 +511,6 @@ case $host in LEVELDB_TARGET_FLAGS="-DOS_MACOSX" if test x$cross_compiling != xyes; then BUILD_OS=darwin - AC_CHECK_PROG([PORT],port, port) - if test x$PORT = xport; then - dnl add default macports paths - CPPFLAGS="$CPPFLAGS -isystem /opt/local/include" - LIBS="$LIBS -L/opt/local/lib" - if test -d /opt/local/include/db48; then - CPPFLAGS="$CPPFLAGS -I/opt/local/include/db48" - LIBS="$LIBS -L/opt/local/lib/db48" - fi - fi - AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert) AC_CHECK_PROG([BREW],brew, brew) if test x$BREW = xbrew; then diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 17ce6c44f..9da03e5b0 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -172,12 +172,6 @@ class DeploymentInfo(object): if os.path.exists(os.path.join(parentDir, "translations")): # Classic layout, e.g. "/usr/local/Trolltech/Qt-4.x.x" self.qtPath = parentDir - elif os.path.exists(os.path.join(parentDir, "share", "qt4", "translations")): - # MacPorts layout, e.g. "/opt/local/share/qt4" - self.qtPath = os.path.join(parentDir, "share", "qt4") - elif os.path.exists(os.path.join(os.path.dirname(parentDir), "share", "qt4", "translations")): - # Newer Macports layout - self.qtPath = os.path.join(os.path.dirname(parentDir), "share", "qt4") else: self.qtPath = os.getenv("QTDIR", None) |