1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
$NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
* Add NetBSD/aarch64 support.
* Disable freetype2 and fontconfig from pkgsrc explicitly.
to fix X11_TYPE=native build and internal pdfium's internal freetype build.
* Fix some static links.
* Include header files from security/gpgme correctly.
* Find devel/apache-ant.
--- configure.ac.orig 2022-01-26 14:35:29.000000000 +0000
+++ configure.ac
@@ -5174,6 +5174,11 @@ linux-android*)
RTL_ARCH=X86_64
PLATFORMID=netbsd_x86_64
;;
+ aarch64)
+ CPUNAME=AARCH64
+ RTL_ARCH=AARCH64
+ PLATFORMID=netbsd_aarch64
+ ;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
@@ -9451,9 +9456,9 @@ elif test "$using_freetype_fontconfig" =
AC_MSG_RESULT([internal])
FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
if test "x$ac_config_site_64bit_host" = xYES; then
- FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64 -lfreetype"
+ FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/instdir/lib64/libfreetype.a"
else
- FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype"
+ FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/instdir/lib/libfreetype.a"
fi
BUILD_TYPE="$BUILD_TYPE FREETYPE"
fi
@@ -10730,11 +10735,11 @@ dnl HarfBuzz
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3],
["-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"],
- ["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"])
+ ["${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"])
libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],
["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],
- ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"])
+ ["${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"])
if test "$COM" = "MSC"; then # override the above
GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
@@ -12442,7 +12447,7 @@ elif test "$_os" = "Linux" -o "$_os" = "
SYSTEM_GPGMEPP=TRUE
# C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
- AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
+ AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I@PREFIX@/include/gpgme++ ],
[AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
# progress_callback is the only func with plain C linkage
# checking for it also filters out older, KDE-dependent libgpgmepp versions
@@ -13611,8 +13616,8 @@ EOF
if test -f /usr/share/ant-core/lib/ant.jar; then
ANT_LIB=/usr/share/ant-core/lib
else
- if test -f $ANT_HOME/lib/ant/ant.jar; then
- ANT_LIB="$ANT_HOME/lib/ant"
+ if test -f $ANT_HOME/lib/java/ant/ant.jar; then
+ ANT_LIB="$ANT_HOME/lib/java/ant"
else
if test -f /usr/share/lib/ant/ant.jar; then
ANT_LIB=/usr/share/lib/ant
|
