Skip to content
Browse files

Merge #15175: build: Drop macports support

4e81438 build: Drop macports support (Ben Woosley)

Pull request description:

  It's unmaintained, according to @theuni.

  Alternative is to put it under CI. I don't have a strong opinion on this, opened for separate consideration.

Tree-SHA512: 65f8bf2bd5351f0907c25fad781a692b4cdcfc9a8b7d8e32329f53e3be64b06f9eb1b74339cfc4be6b80584f4d2bda340d70168013fcf048236267e8e2ccbf27
  • Loading branch information...
jonasschnelli committed Jan 19, 2019
2 parents 6314433 + 4e81438 commit f55808ad6939607c6efb79e9b3604140498c6042
Showing with 0 additions and 17 deletions.
  1. +0 −11
  2. +0 −6 contrib/macdeploy/macdeployqtplus
@@ -511,17 +511,6 @@ case $host in
if test x$cross_compiling != xyes; then
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"

AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
AC_CHECK_PROG([BREW],brew, brew)
if test x$BREW = xbrew; then
@@ -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")
self.qtPath = os.getenv("QTDIR", None)

0 comments on commit f55808a

Please sign in to comment.
You can’t perform that action at this time.