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 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 13 Jan 2020 15:09:16 +0100
Description: Use Debian packaged harfbuzz
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -5,25 +5,15 @@ TARGET_DIR = $(SRC_DIR)/target
TOOLS_DIR = $(SRC_DIR)/../tools
FTHB_VERSION = @FTHB_VERSION@
-HB_VERSION = 1.7.6
-
-HB = harfbuzz-$(HB_VERSION)
-
-LIB_DIR = $(TARGET_DIR)/lib
-HB_STATIC_LIB = $(LIB_DIR)/libharfbuzz.a
-STATIC_LIBS = $(HB_STATIC_LIB)
-
-INCLUDE_DIR = $(TARGET_DIR)/include
-INCLUDE_ARCHIVE = $(TARGET_DIR)/include.tar.gz
PKG_CFLAGS = -DNDEBUG
PKG_CPPFLAGS = \
- -I$(TARGET_DIR)/include/harfbuzz \
+ -I/usr/include/harfbuzz \
-I/usr/include/freetype2
PKG_LIBS = \
- $(HB_STATIC_LIB) \
+ -lharfbuzz \
-lfreetype \
-fPIC
@@ -33,8 +23,6 @@ CXX_FLAG = @CXX_FLAG@
.PHONY: all
all: $(SHLIB)
-$(OBJECTS): $(HB_STATIC_LIB) $(INCLUDE_DIR)
-
# Contains C99 flag
include $(TOOLS_DIR)/config/Makefile
--- a/src/Makebuild
+++ b/src/Makebuild
@@ -1,61 +1 @@
-
-BUILD_DIR = $(SRC_DIR)/build
-HB_BUILD_DIR = $(BUILD_DIR)/$(HB)-CRAN
-
-HB_ARCHIVE = $(TOOLS_DIR)/$(HB)-patched.tar.gz
-ARCHIVES = $(HB_ARCHIVE)
-
-
-# Fixes linker error on Solaris
-override SHLIB_LD = $(CXX)
-
-
-$(HB_BUILD_DIR):
- mkdir -p $(BUILD_DIR) && \
- cd $(BUILD_DIR) && \
- $(TOOLS_DIR)/untar.sh $(TOOLS_DIR)/$(HB)-patched.tar.gz
-
-HB_CFLAGS = -I/usr/include/include/freetype2 -DNDEBUG -g0 $(C99_FLAG) $(CFLAGS)
-HB_CXXFLAGS = -I/usr/include/include/freetype2 -DNDEBUG -g0 $(CXXFLAGS)
-HB_LDFLAGS = -L$(TARGET_DIR)/lib $(LDFLAGS) -lfreetype $(LDFLAGS)
-
-$(HB_STATIC_LIB): $(HB_BUILD_DIR)
- cd $(HB_BUILD_DIR) && \
- AR="$(AR)" && export AR && \
- CC="$(CC)" && export CC && \
- CFLAGS="$(HB_CFLAGS)" && export CFLAGS && \
- CPPFLAGS="$(CPPFLAGS)" && export CPPFLAGS && \
- CXX="$(CXX)" && export CXX && \
- CXXCPP="$(CXXCPP)" && export CXXCPP && \
- CXXFLAGS="$(HB_CXXFLAGS)" && export CXXFLAGS && \
- LIBTOOL="$(LIBTOOL)" && export LIBTOOL && \
- LDFLAGS="$(HB_LDFLAGS)" && export LDFLAGS && \
- RANLIB="$(RANLIB)" && export RANLIB && \
- if ! ./configure \
- --prefix=$(TARGET_DIR) \
- --enable-static=yes \
- --enable-shared=no \
- --with-pic=yes \
- --with-freetype=yes \
- --without-icu \
- --without-cairo \
- --without-fontconfig \
- --without-glib; \
- then \
- cp config.log "$(SRC_DIR)/../tests/harfbuzz-config.log.Rout.fail" && false; \
- fi && \
- echo "#undef HAVE_FT_DONE_MM_VAR" >> config.h && \
- echo "#undef HAVE_FT_GET_VAR_BLEND_COORDINATES" >> config.h && \
- echo "#undef HAVE_FT_SET_VAR_BLEND_COORDINATES" >> config.h && \
- echo "#define NDEBUG 1" >> config.h && \
- $(MAKE) V=0 && \
- $(MAKE) install
-
-
-# Installed above
-$(INCLUDE_DIR):
-
-
-# Local Variables:
-# mode: makefile
-# End:
+# This Makefile is not used but it needs to exist
|