Skip to content

Commit

Permalink
gnutls: use muniversal-1.1
Browse files Browse the repository at this point in the history
Using  muniversal1-1.1 reduced duplicate code
  • Loading branch information
Gcenx authored and Schamschula committed Feb 22, 2023
1 parent c2c4444 commit 205879d
Showing 1 changed file with 3 additions and 27 deletions.
30 changes: 3 additions & 27 deletions devel/gnutls/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
PortGroup conflicts_build 1.0
PortGroup legacysupport 1.0
PortGroup muniversal 1.0
PortGroup muniversal 1.1

name gnutls
version 3.7.9
Expand Down Expand Up @@ -171,32 +171,8 @@ variant guile description {Build guile bindings} {
configure.args-replace --disable-guile --enable-guile
}

if {${universal_possible} && [variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
set merger_host(ppc) powerpc-apple-${os.platform}${os.major}
set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
set merger_configure_args(ppc) --build=powerpc-apple-${os.platform}${os.major}
set merger_configure_args(ppc64) --build=powerpc64-apple-${os.platform}${os.major}
} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
} elseif {${build_arch} eq "ppc"} {
configure.args-append \
--host=powerpc-apple-${os.platform}${os.major} \
--build=powerpc-apple-${os.platform}${os.major}
} elseif {${build_arch} eq "ppc64"} {
configure.args-append \
--host=powerpc64-apple-${os.platform}${os.major} \
--build=powerpc64-apple-${os.platform}${os.major}
} else {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
}
triplet.add_host all
triplet.add_build all

test.run yes
test.target check
Expand Down

0 comments on commit 205879d

Please sign in to comment.