Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion graphics/libjpeg-turbo/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ checksums sha1 6bf63c869105d341011cd4915816de888338231a \
sha256 bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444 \
size 2255497

configure.args -DWITH_JPEG8=ON
if {![info exists universal_possible]} {
set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
}
Expand All @@ -50,8 +51,12 @@ if {${universal_possible} && [variant_isset universal]} {
} elseif {${configure.build_arch} in {i386 x86_64}} {
depends_build-append port:nasm
configure.env ASM_NASM=${prefix}/bin/nasm
} elseif {${configure.build_arch} eq "ppc"} {
if {[catch {sysctl hw.vectorunit} result] || $result == 0} {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't correct if binary distribution can occur (the sysctl result on the build machine could easily be different to that on the host machine), but of course we don't build binaries for ppc. Someone else could though.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added an archive_sites directive so that G3s will not pull binary distributions.

configure.args-append -DWITH_SIMD=OFF
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also needs to go in merger_configure_args(ppc) in the universal case.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify this comment or point me to an example?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure there is a reasonable strategy for adding this option in the universal case. If the host is i386 then the test will not produce a useful result.

archive_sites
}
}
configure.args -DWITH_JPEG8=1

variant java description "Add Java support" {
PortGroup java 1.0
Expand Down