Skip to content

Commit f55808a

Browse files
committed
Merge #15175: build: Drop macports support
4e81438 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
2 parents 6314433 + 4e81438 commit f55808a

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

configure.ac

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -511,17 +511,6 @@ case $host in
511511
LEVELDB_TARGET_FLAGS="-DOS_MACOSX"
512512
if test x$cross_compiling != xyes; then
513513
BUILD_OS=darwin
514-
AC_CHECK_PROG([PORT],port, port)
515-
if test x$PORT = xport; then
516-
dnl add default macports paths
517-
CPPFLAGS="$CPPFLAGS -isystem /opt/local/include"
518-
LIBS="$LIBS -L/opt/local/lib"
519-
if test -d /opt/local/include/db48; then
520-
CPPFLAGS="$CPPFLAGS -I/opt/local/include/db48"
521-
LIBS="$LIBS -L/opt/local/lib/db48"
522-
fi
523-
fi
524-
525514
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
526515
AC_CHECK_PROG([BREW],brew, brew)
527516
if test x$BREW = xbrew; then

contrib/macdeploy/macdeployqtplus

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ class DeploymentInfo(object):
172172
if os.path.exists(os.path.join(parentDir, "translations")):
173173
# Classic layout, e.g. "/usr/local/Trolltech/Qt-4.x.x"
174174
self.qtPath = parentDir
175-
elif os.path.exists(os.path.join(parentDir, "share", "qt4", "translations")):
176-
# MacPorts layout, e.g. "/opt/local/share/qt4"
177-
self.qtPath = os.path.join(parentDir, "share", "qt4")
178-
elif os.path.exists(os.path.join(os.path.dirname(parentDir), "share", "qt4", "translations")):
179-
# Newer Macports layout
180-
self.qtPath = os.path.join(os.path.dirname(parentDir), "share", "qt4")
181175
else:
182176
self.qtPath = os.getenv("QTDIR", None)
183177

0 commit comments

Comments
 (0)