mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
update to ugrep-7.6.0
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
COMMENT = ultra fast universal grep
|
||||
CATEGORIES = sysutils
|
||||
CATEGORIES = textproc sysutils
|
||||
|
||||
GH_ACCOUNT = Genivia
|
||||
GH_PROJECT = ugrep
|
||||
GH_TAGNAME = v7.4.2
|
||||
REVISION = 0
|
||||
GH_TAGNAME = v7.6.0
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE = Yes
|
||||
@@ -20,16 +19,19 @@ LIB_DEPENDS = archivers/brotli \
|
||||
archivers/xz \
|
||||
archivers/zstd \
|
||||
devel/pcre2
|
||||
TEST_DEPENDS = shells/bash
|
||||
|
||||
CONFIGURE_STYLE = gnu
|
||||
CONFIGURE_STYLE = autoreconf
|
||||
AUTOCONF_VERSION = 2.72
|
||||
AUTOMAKE_VERSION = 1.16
|
||||
CONFIGURE_ARGS = --disable-avx2 \
|
||||
--disable-neon \
|
||||
--without-boost-regex
|
||||
|
||||
# All amd64 machines support SSE2, but the same is not true of i386
|
||||
.if ${MACHINE_ARCH:Mi386}
|
||||
CONFIGURE_ARGS += --disable-sse2
|
||||
.endif
|
||||
# All supported armv7/aarch64 have NEON
|
||||
|
||||
USE_GMAKE = Yes
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (ugrep-7.4.2.tar.gz) = QCvgHTJ+S2Wg+TaDvbmFnk2qesop2FsA5mjeTkKDHHg=
|
||||
SIZE (ugrep-7.4.2.tar.gz) = 7226491
|
||||
SHA256 (ugrep-7.6.0.tar.gz) = r+iL30BiI53yQKqitMeIu0KC9VTe4JggELs9Nu8p4cA=
|
||||
SIZE (ugrep-7.6.0.tar.gz) = 7181894
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
No -march=native, please.
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -9016,7 +9016,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.b
|
||||
SIMD_FLAGS="-mfpu=neon -DHAVE_NEON"
|
||||
else
|
||||
# this part is a bit iffy,,,
|
||||
- CXXFLAGS="-march=native -mfpu=neon"
|
||||
+ CXXFLAGS="-mfpu=neon"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <arm_neon.h>
|
||||
@@ -9037,7 +9037,7 @@ esac
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
if test "x$mneon_ok" = "xyes"; then
|
||||
- SIMD_FLAGS="-march=native -mfpu=neon -DHAVE_NEON"
|
||||
+ SIMD_FLAGS="-mfpu=neon -DHAVE_NEON"
|
||||
fi
|
||||
fi
|
||||
CXXFLAGS=$save_CXXFLAGS
|
||||
@@ -9258,7 +9258,7 @@ fi
|
||||
if test "x$mneon_ok" = "xyes"; then
|
||||
SIMD_FLAGS="-mfpu=neon -DHAVE_NEON"
|
||||
else
|
||||
- CXXFLAGS="-march=native -mfpu=neon"
|
||||
+ CXXFLAGS="-mfpu=neon"
|
||||
if test "$cross_compiling" = yes
|
||||
then :
|
||||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
|
||||
@@ -9290,7 +9290,7 @@ esac
|
||||
fi
|
||||
|
||||
if test "x$mneon_ok" = "xyes"; then
|
||||
- SIMD_FLAGS="-march=native -mfpu=neon -DHAVE_NEON"
|
||||
+ SIMD_FLAGS="-mfpu=neon -DHAVE_NEON"
|
||||
fi
|
||||
fi
|
||||
CXXFLAGS=$save_CXXFLAGS
|
||||
@@ -0,0 +1,34 @@
|
||||
Index: configure.ac
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -156,15 +156,6 @@ if test "x$cross_compiling" = "xyes"; then
|
||||
[mneon_ok=no])
|
||||
if test "x$mneon_ok" = "xyes"; then
|
||||
SIMD_FLAGS="-mfpu=neon -DHAVE_NEON"
|
||||
- else
|
||||
- # this part is a bit iffy,,,
|
||||
- CXXFLAGS="-march=native -mfpu=neon"
|
||||
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <arm_neon.h>]], [[uint64x2_t n; uint64_t m = vgetq_lane_u64(n, 0);]])],
|
||||
- [mneon_ok=yes],
|
||||
- [mneon_ok=no])
|
||||
- if test "x$mneon_ok" = "xyes"; then
|
||||
- SIMD_FLAGS="-march=native -mfpu=neon -DHAVE_NEON"
|
||||
- fi
|
||||
fi
|
||||
CXXFLAGS=$save_CXXFLAGS
|
||||
fi
|
||||
@@ -239,14 +230,6 @@ else
|
||||
[mneon_ok=no])
|
||||
if test "x$mneon_ok" = "xyes"; then
|
||||
SIMD_FLAGS="-mfpu=neon -DHAVE_NEON"
|
||||
- else
|
||||
- CXXFLAGS="-march=native -mfpu=neon"
|
||||
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <arm_neon.h>]],[[uint64x2_t n; uint64_t m = vgetq_lane_u64(n, 0);]])],
|
||||
- [mneon_ok=yes],
|
||||
- [mneon_ok=no])
|
||||
- if test "x$mneon_ok" = "xyes"; then
|
||||
- SIMD_FLAGS="-march=native -mfpu=neon -DHAVE_NEON"
|
||||
- fi
|
||||
fi
|
||||
CXXFLAGS=$save_CXXFLAGS
|
||||
fi
|
||||
Reference in New Issue
Block a user