macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Adapt Portfiles to base *.env parsing changes

Browse Source 
See: #116
This commit is contained in:
Joshua Root
2019-03-23 20:30:33 +11:00
parent 0e22d1bdbb
commit a560834f1e
354 changed files with 2013 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aqua/qt3-mac/Portfile
+6 -6
View File
@@ -48,9 +48,9 @@ variant mysql5 conflicts mysql4 description "add MySQL 5 support" {
}
configure.cmd "echo yes | ./configure"
configure.env DYLD_LIBRARY_PATH='' \
QMAKESPEC='' \
QTDIR=''
configure.env DYLD_LIBRARY_PATH= \
QMAKESPEC= \
QTDIR=
configure.args -v -prefix '${prefix}' \
-docdir '${prefix}/share/doc/${name}/html' \
-datadir '${prefix}/share/qt3' \
@@ -66,9 +66,9 @@ configure.args -v -prefix '${prefix}' \
'-I${prefix}/include' \
'-L${prefix}/lib'
build.env DYLD_LIBRARY_PATH="${worksrcpath}/lib" \
QMAKESPEC='' \
QTDIR=''
build.env DYLD_LIBRARY_PATH=${worksrcpath}/lib \
QMAKESPEC= \
QTDIR=
build.target symlinks src-qmake src-moc sub-src sub-tools
destroot.destdir INSTALL_ROOT='${destroot}'
aqua/qt4-mac/Portfile
+1 -1
View File
@@ -685,7 +685,7 @@ pre-configure {
# set which stdlib to use; clang only
if {[string match *clang* ${configure.compiler}]} {
configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
configure.env-append QMAKE_STDLIB=-stdlib=${configure.cxx_stdlib}
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
}
archivers/arc/Portfile
+7 -1
View File
@@ -25,11 +25,17 @@ patchfiles patch-gcc-warnings.diff \
use_configure no
variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
} else {
build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]' \
PREFIX='${prefix}'
}
destroot {
xinstall -W ${worksrcpath} ${name} m${name} ${destroot}${prefix}/bin
archivers/libzzip/Portfile
+1 -1
View File
@@ -30,7 +30,7 @@ depends_lib port:zlib
set docdir ${prefix}/share/doc/${name}
configure.python ${prefix}/bin/python2.7
configure.env ac_cv_path_PAX=":"
configure.env ac_cv_path_PAX=:
post-configure {
set builddir [glob -dir ${worksrcpath} "*apple-darwin*"]
archivers/pbzip2/Portfile
+7
View File
@@ -32,10 +32,17 @@ use_configure no
variant universal {}
pre-build {
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append \
CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
} else {
build.env-append \
CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}
}
destroot.args PREFIX=${prefix}
archivers/pigz/Portfile
+6
View File
@@ -31,9 +31,15 @@ use_configure no
variant universal {}
build.target
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
} else {
build.env-append CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}
destroot {
xinstall -m 644 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1
archivers/upx/Portfile
+6
View File
@@ -52,9 +52,15 @@ post-configure {
variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env CXX=${configure.cxx} \
"CXXFLAGS_OPTIMIZE=${configure.cxxflags} [get_canonical_archflags cxx]" \
CXXFLAGS_WERROR=
} else {
build.env CXX="${configure.cxx}" \
CXXFLAGS_OPTIMIZE="${configure.cxxflags} [get_canonical_archflags cxx]" \
CXXFLAGS_WERROR=
}
destroot {
xinstall -m 755 ${worksrcpath}/src/upx.out ${destroot}${prefix}/bin/upx
archivers/zstd/Portfile
+9
View File
@@ -37,12 +37,21 @@ variant universal {}
build.target allmost
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
} else {
build.env-append CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX="${prefix}"
}
test.run yes
test.env-append {*}${build.env}
audio/mp3_check/Portfile
+5
View File
@@ -27,8 +27,13 @@ patch {
use_configure no
configure.cflags-append -std=gnu89
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env CC=${configure.cc} \
"CFLAGS=${configure.cflags} ${configure.cc_archflags}"
} else {
build.env CC="${configure.cc}" \
CFLAGS="${configure.cflags} ${configure.cc_archflags}"
}
destroot {
xinstall -m 755 ${worksrcpath}/mp3_check \
audio/mp3unicode/Portfile
+1 -1
View File
@@ -21,7 +21,7 @@ checksums rmd160 bb31045c51ef7d789ffe22767cf721fc7bc3ec30 \
size 101593
configure.env-append \
ICONV_LIBS="-liconv"
ICONV_LIBS=-liconv
depends_build port:pkgconfig
benchmarks/forkbomb/Portfile
+6 -1
View File
@@ -28,9 +28,14 @@ patchfiles patch-Makefile.diff
use_configure no
variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
} else {
build.env-append CC=${configure.cc} \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}
destroot.args-append PREFIX=${prefix}
benchmarks/nbench-byte/Portfile
+4
View File
@@ -44,7 +44,11 @@ post-install {
}
if {${build_arch} ne ""} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CFLAGS=${configure.cc_archflags}
} else {
build.env-append CFLAGS="${configure.cc_archflags}"
}
}
livecheck.type regex
cross/msp430-gdb-devel/Portfile
+2 -2
View File
@@ -43,8 +43,8 @@ configure.args --target=${name_target} \
patch.pre_args -p1
build.env-append CFLAGS="-I${prefix}/include"
configure.env-append CFLAGS="-I${prefix}/include"
build.env-append CFLAGS=-I${prefix}/include
configure.env-append CFLAGS=-I${prefix}/include
# TODO: Why? Ticket URL?
compiler.blacklist *clang*
cross/msp430-gdb/Portfile
+2 -2
View File
@@ -42,8 +42,8 @@ configure.args --target=${name_target} \
patch.pre_args -p1
build.env-append CFLAGS="-I${prefix}/include"
configure.env-append CFLAGS="-I${prefix}/include"
build.env-append CFLAGS=-I${prefix}/include
configure.env-append CFLAGS=-I${prefix}/include
# TODO: Why? Ticket URL?
compiler.blacklist *clang*
databases/leveldb/Portfile
+19 -3
View File
@@ -48,6 +48,21 @@ if {[string match *clang* ${configure.cxx}]} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
if {[vercmp [macports_version] 2.5.99] >= 0} {
if { [variant_isset universal] } {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) \
"CFLAGS=${configure.cflags} -arch ${arch}" \
"CXXFLAGS=${configure.cxxflags} -arch ${arch}" \
"LDFLAGS=${configure.ldflags} -arch ${arch}"
}
} else {
build.env-append \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
}
} else {
if { [variant_isset universal] } {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) \
@@ -61,12 +76,13 @@ if { [variant_isset universal] } {
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}
}
build.env-append \
INSTALL_PATH=${prefix}/lib \
CC="${configure.cc}" \
CXX="${configure.cxx}" \
OPT="-DNDEBUG"
CC=${configure.cc} \
CXX=${configure.cxx} \
OPT=-DNDEBUG
destroot {
xinstall -d -m 0755 ${destroot}${prefix}/include/leveldb
databases/rocksdb/Portfile
+18
View File
@@ -32,7 +32,24 @@ patchfiles-append patch-Makefile.diff
use_configure no
variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CFLAGS=[get_canonical_archflags cc] \
CXXFLAGS=[get_canonical_archflags cxx] \
PORTABLE=1 \
DEBUG_LEVEL=0 \
OPT=${configure.optflags}
destroot.env-append CC=${configure.cc} \
CXX=${configure.cxx} \
CFLAGS=[get_canonical_archflags cc] \
CXXFLAGS=[get_canonical_archflags cxx] \
PORTABLE=1 \
DEBUG_LEVEL=0 \
OPT=${configure.optflags} \
INSTALL_PATH=${destroot}${prefix}
} else {
build.env CC="${configure.cc}" \
CXX="${configure.cxx}" \
CFLAGS="[get_canonical_archflags cc]" \
@@ -49,3 +66,4 @@ destroot.env-append CC="${configure.cc}" \
DEBUG_LEVEL=0 \
OPT="${configure.optflags}" \
INSTALL_PATH=${destroot}${prefix}
}
databases/tokyocabinet-java/Portfile
+11
View File
@@ -25,6 +25,16 @@ set javahome /System/Library/Frameworks/JavaVM.framework
patch.args -p1
patchfiles patch-Makefile.in.diff
if {[vercmp [macports_version] 2.5.99] >= 0} {
## configure ##
configure.env MYJAVAHOME=${javahome} \
"CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
LDFLAGS=-L${prefix}/lib INCLUDEDIR=${javahome}/Headers
## build ##
build.env "CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
LDFLAGS=-L${prefix}/lib
} else {
## configure ##
configure.env MYJAVAHOME=${javahome} \
CFLAGS="-I${prefix}/include -I${javahome}/Headers" \
@@ -33,6 +43,7 @@ configure.env MYJAVAHOME=${javahome} \
## build ##
build.env CFLAGS="-I${prefix}/include -I${javahome}/Headers" \
LDFLAGS=-L${prefix}/lib
}
post-destroot {
set jarfile tokyocabinet.jar
devel/PIDA/Portfile
+7
View File
@@ -30,11 +30,18 @@ depends_lib port:py${python.version}-bpython \
port:py${python.version}-py \
port:libmagic \
port:dbus-python${python.version}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
PATH=${python.prefix}/bin:$env(PATH)
destroot.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
PATH=${python.prefix}/bin:$env(PATH)
} else {
build.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig" \
PATH="${python.prefix}/bin:$env(PATH)"
destroot.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig" \
PATH="${python.prefix}/bin:$env(PATH)"
}
livecheck.type none
devel/afl/Portfile
+9 -1
View File
@@ -25,13 +25,21 @@ checksums rmd160 b7c1174111cfc11d14a0982359ef903d5b8d1267 \
sha256 43614b4b91c014d39ef086c5cc84ff5f068010c264c2c05bf199df60898ce045
use_configure no
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env CC=${configure.cc} \
CXX=${configure.cxx} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
} else {
build.env CC=${configure.cc} \
CXX="${configure.cxx}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
}
destroot.env PREFIX=${prefix}
devel/appstream-glib/Portfile
+5
View File
@@ -60,8 +60,13 @@ if {[variant_isset universal]} {
lappend merger_destroot_env(${arch}) CC='${configure.cc} -arch ${arch}'
}
} else {
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
} else {
build.env-append CC="${configure.cc} ${configure.cc_archflags}"
destroot.env-append CC="${configure.cc} ${configure.cc_archflags}"
}
}
configure.args -Drpm=false

Some files were not shown because too many files have changed in this diff Show More