diff options
| author | Alex Kozlov <ak@FreeBSD.org> | 2017-03-22 22:50:16 +0000 |
|---|---|---|
| committer | Alex Kozlov <ak@FreeBSD.org> | 2017-03-22 22:50:16 +0000 |
| commit | db72d16f3d672e674899d6297dbdbe2e687dcc58 (patch) | |
| tree | 6b906b5bdff39c5f5bed20f3f3d4465090f1993f /graphics/pngquant/files/patch-lib_configure | |
| parent | Update to 4.3.0 (diff) | |
- Update to 2.9.0
- Remove MAKE_ARGS, CPPFLAGS, LDFLAGS - handled by configure
- Use configure to handle DEBUG option
- Add description for OPTIMIZED_FLAGS
- Disable OPENMP option for now - impossible to use without significant
manual intervention on 10.x-11.x (needs devel/llvm39 or modern gcc)
- Use configure to handle SSE option (only provided on i386/amd64, enabled by default on amd64)
- Conditionally install DOCS
PR: 217987
Submitted by: Anton Yuzhaninov <citrin+pr@citrin.ru> (except OPENMP stuff)
Notes
Notes:
svn path=/head/; revision=436747
Diffstat (limited to 'graphics/pngquant/files/patch-lib_configure')
| -rw-r--r-- | graphics/pngquant/files/patch-lib_configure | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/graphics/pngquant/files/patch-lib_configure b/graphics/pngquant/files/patch-lib_configure index da66afb0f590..15099467da5e 100644 --- a/graphics/pngquant/files/patch-lib_configure +++ b/graphics/pngquant/files/patch-lib_configure @@ -1,11 +1,12 @@ -Index: lib/configure +--- lib/configure.orig 2017-03-02 11:48:03 UTC ++++ lib/configure @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh CONFIG="config.mk" PREFIX="/usr/local" -@@ -80,7 +80,7 @@ +@@ -79,7 +79,7 @@ done # If someone runs sudo make install as very first command, and configure later, # $CONFIG cannot be overwritten, and must be deleted before continuing. @@ -14,20 +15,22 @@ Index: lib/configure echo "Cannot overwrite file $CONFIG! Please delete it." exit 1 fi -@@ -135,10 +135,8 @@ - +@@ -138,12 +138,8 @@ fi # SSE if [ "$SSE" = 'auto' ]; then -- if [[ "$(uname -m)" =~ (amd|x86_)64 || -- "$(grep -E -m1 "^flags" /proc/cpuinfo)" =~ "sse" ]]; then -- SSE=1 + SSE=0 +- if type uname > /dev/null; then +- if [[ "$(uname -m)" =~ "amd64" || "$(uname -m)" =~ "x86_64" || +- "$(grep -E -m1 "^flags" /proc/cpuinfo)" =~ "sse" ]]; then +- SSE=1 +- fi - fi + echo $(uname -m) | grep -E -q '(amd|x86_)64' && SSE=1 + grep -E -m1 -q '^flags.*sse' /proc/cpuinfo 2>/dev/null && SSE=1 fi if [ "$SSE" -eq 1 ]; then -@@ -161,9 +159,8 @@ +@@ -166,9 +162,8 @@ if [ -n "$OPENMP" ]; then else OPENMPFLAGS="-fopenmp" fi |