Skip to content

Commit

Permalink
devel/{p4,p4api}: Unbreak build on arm
Browse files Browse the repository at this point in the history
Also change devel/p4api to use devel/p4 files/patches and distinfo.

PR:		270531
Approved by:	antonfb@hesiod.org (maintainer)
  • Loading branch information
Craig Leres authored and Craig Leres committed Apr 9, 2023
1 parent de1bb16 commit c3c2129
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 34 deletions.
6 changes: 3 additions & 3 deletions devel/p4/files/patch-Jamrules
@@ -1,6 +1,6 @@
--- Jamrules.orig 2018-02-01 21:40:54 UTC
--- Jamrules.orig 2023-01-19 09:37:52 UTC
+++ Jamrules
@@ -449,12 +449,11 @@
@@ -673,12 +673,11 @@
# P4BIN is set to ../p4-bin (relative to P4)

SubDir AllP4 p4 ; # where we are
Expand All @@ -14,7 +14,7 @@
$(BUILD)
$(TYPE:L) ;

@@ -931,11 +930,6 @@
@@ -1224,11 +1223,6 @@
OPTIM += -Wno-parentheses -Wno-switch -fwrapv ;

_mflags = ;
Expand Down
11 changes: 11 additions & 0 deletions devel/p4/files/patch-zlib_deflate.c
@@ -0,0 +1,11 @@
--- zlib/deflate.c.orig 2023-04-08 02:21:18 UTC
+++ zlib/deflate.c
@@ -56,7 +56,7 @@
* Perforce change. Disable neon speedup (for now)
* on Apple M1 builds.
*/
-#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__)
+#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) || defined( OS_FREEBSD ) ) && defined(__aarch64__)
#undef __ARM_NEON__
#undef __ARM_NEON
#endif
4 changes: 4 additions & 0 deletions devel/p4api/Makefile
Expand Up @@ -19,6 +19,10 @@ BUILD_DEPENDS= ${JAM}:devel/jam

USES= tar:tgz

PATCHDIR= ${.CURDIR}/../p4/files

DISTINFO_FILE= ${.CURDIR}/../p4/distinfo

OPTIONS_DEFINE= EXAMPLES

WRKSRC= ${WRKDIR}/p4source-${PORTVERSION}
Expand Down
3 changes: 0 additions & 3 deletions devel/p4api/distinfo

This file was deleted.

28 changes: 0 additions & 28 deletions devel/p4api/files/patch-Jamrules

This file was deleted.

0 comments on commit c3c2129

Please sign in to comment.