diff --git a/make/target-development.mk b/make/target-development.mk index f9c5a34e..7db42ae3 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -3,7 +3,12 @@ # # ----------------------------------------------------------------------------- -valgrind: valgrind-$(BOXSERIES) +VALGRIND_TARGET = valgrind3 +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1)) + VALGRIND_TARGET = valgrind12305 +endif + +valgrind: $(VALGRIND_TARGET) # ----------------------------------------------------------------------------- @@ -15,11 +20,9 @@ VALGRIND_URL = ftp://sourceware.org/pub/valgrind $(ARCHIVE)/$(VALGRIND_SOURCE): $(DOWNLOAD) $(VALGRIND_URL)/$(VALGRIND_SOURCE) -VALGRIND_PATCH = valgrind-fix-$(BOXSERIES)-build.patch +VALGRIND_PATCH = valgrind-fix-build-$(BOXSERIES).patch -$(D)/valgrind-bre2ze4k \ -$(D)/valgrind-hd51 \ -$(D)/valgrind-hd2: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR) +$(D)/valgrind3: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(VALGRIND_TMP) $(UNTAR)/$(VALGRIND_SOURCE) $(CHDIR)/$(VALGRIND_TMP); \ @@ -42,15 +45,15 @@ $(D)/valgrind-hd2: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -VALGRIND-HD1_PATCH = valgrind12305-nevis-patch.diff -VALGRIND-HD1_PATCH += valgrind-automake-1.11.2.patch +VALGRIND12305_PATCH = valgrind12305-nevis-patch.diff +VALGRIND12305_PATCH += valgrind12305-automake-1.11.2.patch -$(D)/valgrind-hd1: +$(D)/valgrind12305: $(REMOVE)/valgrind svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_TMP)/valgrind; \ $(CHDIR)/valgrind; \ svn up --force -r {2011-12-13} VEX; \ - $(call apply_patches, $(VALGRIND-HD1_PATCH)); \ + $(call apply_patches, $(VALGRIND12305_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ diff --git a/patches/freetype/config.patch b/patches/freetype/config.patch new file mode 100644 index 00000000..dfacfe92 --- /dev/null +++ b/patches/freetype/config.patch @@ -0,0 +1,20 @@ +diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in +index 2d5b90d..1c14aab 100644 +--- a/builds/unix/freetype-config.in ++++ b/builds/unix/freetype-config.in +@@ -35,11 +35,11 @@ if test $? -eq 0 ; then + dynamic_libs=`%PKG_CONFIG% --libs freetype2` + static_libs=`%PKG_CONFIG% --static --libs freetype2` + else +- prefix="%prefix%" +- exec_prefix="%exec_prefix%" ++prefix="%prefix%" ++ exec_prefix="${prefix}" + +- includedir="%includedir%" +- libdir="%libdir%" ++ includedir="${prefix}/include" ++ libdir="${exec_prefix}/lib" + + version=%ft_version% + diff --git a/patches/freetype/pkgconf.patch b/patches/freetype/pkgconf.patch new file mode 100644 index 00000000..9d0fb06c --- /dev/null +++ b/patches/freetype/pkgconf.patch @@ -0,0 +1,14 @@ +--- a/builds/unix/freetype2.in ++++ b/builds/unix/freetype2.in +@@ -1,7 +1,7 @@ + prefix=%prefix% +-exec_prefix=%exec_prefix% +-libdir=%libdir% +-includedir=%includedir% ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include + + Name: FreeType 2 + URL: https://freetype.org + diff --git a/patches/freetype/subpixel.patch b/patches/freetype/subpixel.patch new file mode 100644 index 00000000..73f7dee6 --- /dev/null +++ b/patches/freetype/subpixel.patch @@ -0,0 +1,11 @@ +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -126,7 +126,7 @@ + * macro is not defined, FreeType offers alternative LCD rendering + * technology that produces excellent output without LCD filtering. + */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /************************************************************************** diff --git a/patches/valgrind-fix-hd51-build.patch b/patches/valgrind-fix-build-bre2ze4k.patch similarity index 97% rename from patches/valgrind-fix-hd51-build.patch rename to patches/valgrind-fix-build-bre2ze4k.patch index 4108be65..55afae7e 100644 --- a/patches/valgrind-fix-hd51-build.patch +++ b/patches/valgrind-fix-build-bre2ze4k.patch @@ -2,7 +2,7 @@ From 9901cac770d0d81ccf1ee8e5a02abf54d18e3a04 Mon Sep 17 00:00:00 2001 Message-Id: <9901cac770d0d81ccf1ee8e5a02abf54d18e3a04.1509108606.git.thomas.harfmann@gmail.com> From: gixxpunk Date: Fri, 27 Oct 2017 14:50:01 +0200 -Subject: [PATCH] - valgrind-fix-hd51-build +Subject: [PATCH] - valgrind-fix-build-hd51 --- Makefile.all.am | 6 +++--- diff --git a/patches/valgrind-fix-hd2-build.patch b/patches/valgrind-fix-build-hd2.patch similarity index 97% rename from patches/valgrind-fix-hd2-build.patch rename to patches/valgrind-fix-build-hd2.patch index e0b7306f..1deced89 100644 --- a/patches/valgrind-fix-hd2-build.patch +++ b/patches/valgrind-fix-build-hd2.patch @@ -2,7 +2,7 @@ From f0b4fd4d1c96b77cbf6c881b7d2d29882a05ab89 Mon Sep 17 00:00:00 2001 Message-Id: From: gixxpunk Date: Fri, 27 Oct 2017 14:45:27 +0200 -Subject: [PATCH] - valgrind-fix-hd2-build +Subject: [PATCH] - valgrind-fix-build-hd2 --- Makefile.all.am | 6 +++--- diff --git a/patches/valgrind-fix-build-hd51.patch b/patches/valgrind-fix-build-hd51.patch new file mode 100644 index 00000000..55afae7e --- /dev/null +++ b/patches/valgrind-fix-build-hd51.patch @@ -0,0 +1,46 @@ +From 9901cac770d0d81ccf1ee8e5a02abf54d18e3a04 Mon Sep 17 00:00:00 2001 +Message-Id: <9901cac770d0d81ccf1ee8e5a02abf54d18e3a04.1509108606.git.thomas.harfmann@gmail.com> +From: gixxpunk +Date: Fri, 27 Oct 2017 14:50:01 +0200 +Subject: [PATCH] - valgrind-fix-build-hd51 + +--- + Makefile.all.am | 6 +++--- + configure.ac | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.all.am b/Makefile.all.am +index 1859a51..648a197 100644 +--- a/Makefile.all.am ++++ b/Makefile.all.am +@@ -199,11 +199,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g + + AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ + AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ +- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 ++ $(AM_CFLAGS_BASE) -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float + AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ +- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) ++ -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float $(AM_CFLAGS_PSO_BASE) + AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ +- -marm -mcpu=cortex-a8 -g ++ -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float -g + + AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ + AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) +diff --git a/configure.ac b/configure.ac +index 3874296..0fc12f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -234,7 +234,7 @@ case "${host_cpu}" in + ARCH_MAX="s390x" + ;; + +- armv7*) ++ arm*) + AC_MSG_RESULT([ok (${host_cpu})]) + ARCH_MAX="arm" + ;; +-- +2.15.0.rc2 + diff --git a/patches/valgrind-automake-1.11.2.patch b/patches/valgrind12305-automake-1.11.2.patch similarity index 100% rename from patches/valgrind-automake-1.11.2.patch rename to patches/valgrind12305-automake-1.11.2.patch