tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
macOS/arm64 patches (was: the 2020Q4 freeze is over!)
Here's my current diff to make more things work on arm64 macOS:
I'm not sure the fix for the pango/harfbuzz/graphite2 mess is correct, though.
Has anyone done a bulk build with LIBSRVG_TYPE=c?
Index: devel/nss/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nss/distinfo,v
retrieving revision 1.121
diff -u -r1.121 distinfo
--- devel/nss/distinfo 17 Dec 2020 09:52:27 -0000 1.121
+++ devel/nss/distinfo 1 Jan 2021 12:13:16 -0000
@@ -14,6 +14,7 @@
SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
+SHA1 (patch-nss_coreconf_Darwin.mk) = 4a08d79aba4e1f74927b044917381217a1cb3246
SHA1 (patch-nss_coreconf_NetBSD.mk) = ed95aa1c245c9f2b8fda0a1769f9599223b61dbf
SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754
SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
Index: devel/pango/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/Makefile,v
retrieving revision 1.236
diff -u -r1.236 Makefile
--- devel/pango/Makefile 15 Sep 2020 10:45:41 -0000 1.236
+++ devel/pango/Makefile 1 Jan 2021 12:13:17 -0000
@@ -12,7 +12,7 @@
TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++ c++11
USE_TOOLS+= gmake pkg-config
INSTALLATION_DIRS= ${PKGMANDIR}/man1
@@ -56,9 +56,7 @@
.include "../../fonts/fontconfig/buildlink3.mk"
BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.7.2
.include "../../fonts/harfbuzz/buildlink3.mk"
-.if ${LIBRSVG_TYPE} == "rust"
.include "../../graphics/graphite2/buildlink3.mk"
-.endif
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.10
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/cairo-gobject/buildlink3.mk"
Index: devel/pango/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/PLIST,v
retrieving revision 1.74
diff -u -r1.74 PLIST
--- devel/pango/PLIST 4 Sep 2020 11:14:08 -0000 1.74
+++ devel/pango/PLIST 1 Jan 2021 12:13:17 -0000
@@ -30,7 +30,6 @@
include/pango-1.0/pango/pango-version-macros.h
include/pango-1.0/pango/pango.h
include/pango-1.0/pango/pangocairo.h
-${PLIST.quartz}include/pango-1.0/pango/pangocoretext.h
include/pango-1.0/pango/pangofc-decoder.h
include/pango-1.0/pango/pangofc-font.h
include/pango-1.0/pango/pangofc-fontmap.h
Index: fonts/harfbuzz/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/harfbuzz/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- fonts/harfbuzz/buildlink3.mk 5 Oct 2020 15:38:45 -0000 1.14
+++ fonts/harfbuzz/buildlink3.mk 1 Jan 2021 12:13:20 -0000
@@ -14,9 +14,7 @@
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.if ${LIBRSVG_TYPE} == "rust"
.include "../../graphics/graphite2/buildlink3.mk"
-.endif
.endif # HARFBUZZ_BUILDLINK3_MK
BUILDLINK_TREE+= -harfbuzz
Index: graphics/graphite2/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/graphite2/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- graphics/graphite2/distinfo 17 Jul 2019 09:45:13 -0000 1.11
+++ graphics/graphite2/distinfo 1 Jan 2021 12:13:22 -0000
@@ -4,4 +4,4 @@
RMD160 (graphite2-1.3.13.tgz) = a222c91d85d1353e76936d0239cf092aa870910f
SHA512 (graphite2-1.3.13.tgz) = 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
Size (graphite2-1.3.13.tgz) = 6664757 bytes
-SHA1 (patch-src_CMakeLists.txt) = 24c0e719283156bb74c51a6029245b293e1c16ae
+SHA1 (patch-src_CMakeLists.txt) = efb3978be11e555294ed41454ef78663ba1a5ab0
Index: graphics/graphite2/patches/patch-src_CMakeLists.txt
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/graphite2/patches/patch-src_CMakeLists.txt,v
retrieving revision 1.7
diff -u -r1.7 patch-src_CMakeLists.txt
--- graphics/graphite2/patches/patch-src_CMakeLists.txt 17 Jul 2019 09:45:13 -0000 1.7
+++ graphics/graphite2/patches/patch-src_CMakeLists.txt 1 Jan 2021 12:13:22 -0000
@@ -2,9 +2,25 @@
Always install the libtool .la file.
---- src/CMakeLists.txt.orig 2018-12-20 06:28:50.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -151,6 +151,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Wind
+Don't use SSE on Darwin with non-Intel processors.
+
+--- ./src/CMakeLists.txt.orig 2018-12-20 00:28:50.000000000 -0600
++++ ./src/CMakeLists.txt 2020-12-28 11:59:05.000000000 -0600
+@@ -136,9 +136,12 @@
+
+ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ set_target_properties(graphite2 PROPERTIES
+- COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -mfpmath=sse -msse2"
++ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
+ LINK_FLAGS "-nodefaultlibs"
+ LINKER_LANGUAGE C)
++ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
++ add_definitions(-mfpmath=sse -msse2)
++ endif()
+ target_link_libraries(graphite2 c)
+ include(Graphite)
+ nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+@@ -151,6 +154,12 @@
COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
endif()
Index: graphics/librsvg-c/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/librsvg-c/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- graphics/librsvg-c/Makefile 5 Nov 2020 09:08:25 -0000 1.8
+++ graphics/librsvg-c/Makefile 1 Jan 2021 12:13:22 -0000
@@ -58,4 +58,5 @@
BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.9
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../graphics/graphite2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: lang/python27/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python27/distinfo,v
retrieving revision 1.81
diff -u -r1.81 distinfo
--- lang/python27/distinfo 27 Sep 2020 14:57:22 -0000 1.81
+++ lang/python27/distinfo 1 Jan 2021 12:13:24 -0000
@@ -35,6 +35,6 @@
SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
SHA1 (patch-Modules_sunaudiodev.c) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
SHA1 (patch-Python_thread__pthread.h) = 517cfefc2f2e13631d22bad28c327513cdf17c10
-SHA1 (patch-configure) = 999700e96dd227cdd16cea3ae1001eb887ab8fee
+SHA1 (patch-configure) = 637345c9f1a5c9d617f3588203495bccfba6136c
SHA1 (patch-pyconfig.h.in) = a0143ecdc2a3fb10220d0e3ee94fb9779a45e9e1
SHA1 (patch-setup.py) = bf9763d5a3584970474d5951ed1fc73eb03ea11c
Index: lang/python27/patches/patch-configure
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python27/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- lang/python27/patches/patch-configure 17 Jun 2018 19:21:21 -0000 1.1
+++ lang/python27/patches/patch-configure 1 Jan 2021 12:13:24 -0000
@@ -6,8 +6,8 @@
- honor pkgsrc LDFLAGS
- other stuff not previously commented (XXX)
---- configure.orig 2018-04-29 22:47:33.000000000 +0000
-+++ configure
+--- configure.orig 2020-04-19 23:13:39.000000000 +0200
++++ configure 2020-12-09 17:03:36.000000000 +0100
@@ -3356,7 +3356,7 @@ case $ac_sys_system/$ac_sys_release in
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
# In addition, Stefan Krah confirms that issue #1244610 exists through
@@ -57,7 +57,17 @@
then
# OS X 10.3 through 10.5
cur_target=10.3
-@@ -8617,9 +8615,9 @@ then
+@@ -8474,6 +8472,9 @@ fi
+ ppc)
+ MACOSX_DEFAULT_ARCH="ppc64"
+ ;;
++ arm64)
++ MACOSX_DEFAULT_ARCH="arm64"
++ ;;
+ *)
+ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
+ ;;
+@@ -8624,9 +8625,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -70,7 +80,7 @@
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -8642,9 +8640,9 @@ then
+@@ -8649,9 +8650,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -83,7 +93,7 @@
fi
else
# building for OS X 10.3 and later
-@@ -8655,7 +8653,7 @@ then
+@@ -8662,7 +8663,7 @@ then
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
@@ -92,7 +102,7 @@
BSD/OS*/4*)
LDSHARED="gcc -shared"
LDCXXSHARED="g++ -shared";;
-@@ -8683,6 +8681,9 @@ then
+@@ -8690,6 +8691,9 @@ then
;;
esac
fi;;
@@ -102,7 +112,7 @@
NetBSD*|DragonFly*)
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
-@@ -8729,7 +8730,8 @@ then
+@@ -8736,7 +8740,8 @@ then
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
@@ -112,7 +122,7 @@
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -8781,11 +8783,12 @@ then
+@@ -8788,11 +8793,12 @@ then
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -126,7 +136,7 @@
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -10798,6 +10801,10 @@ int
+@@ -10883,6 +10889,10 @@ int
main ()
{
int x=kqueue()
Home |
Main Index |
Thread Index |
Old Index