From c3fe0a3649a381a09570b224ea94de8ccb9c3e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 5 Dec 2016 20:42:04 +0100 Subject: [PATCH] mkdepend: build on x86_64. --- haiku-apps/mkdepend/mkdepend-1.7.recipe | 3 +- .../mkdepend/patches/mkdepend-1.7.patchset | 91 +++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 haiku-apps/mkdepend/patches/mkdepend-1.7.patchset diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index 049231244..fd70c7b65 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -4,10 +4,11 @@ dependency trees into an existing makefile." HOMEPAGE="http://www.bearnip.com/lars/be/mkdepend.html" COPYRIGHT="1995-2001 Lars Düning" LICENSE="MIT" -REVISION="3" +REVISION="4" SOURCE_URI="http://www.bearnip.com/ftp/be/MkDepend-17.zip" CHECKSUM_SHA256="a5ddc9f1ed5c987ff2dd35978b0fe36e95f1f6e90e9b68cd5c35e99a60b9da88" SOURCE_DIR="MkDepend-$portVersion" +PATCHES="mkdepend-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/mkdepend/patches/mkdepend-1.7.patchset b/haiku-apps/mkdepend/patches/mkdepend-1.7.patchset new file mode 100644 index 000000000..38a700d68 --- /dev/null +++ b/haiku-apps/mkdepend/patches/mkdepend-1.7.patchset @@ -0,0 +1,91 @@ +From 8b81609f8ef49f86f6c84423f625858ed3b41190 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 5 Dec 2016 18:55:16 +0000 +Subject: x86_64 support + + +diff --git a/Makefile b/Makefile +index 92f825d..2a6ce63 100644 +--- a/Makefile ++++ b/Makefile +@@ -85,16 +85,25 @@ ifndef CPU + ifeq ($(MACHINE), BePC) + CPU = x86 + else ++ifeq ($(MACHINE), x86_64) ++ CPU = x86 ++else + CPU = ppc + endif + endif ++endif + ifeq ($(MACHINE), BePC) + NATIVE = x86 + CROSS = ppc + else ++ifeq ($(MACHINE), x86_64) ++ NATIVE = x86 ++ CROSS = ppc ++else + NATIVE = ppc + CROSS = x86 + endif ++endif + + + # set the object directory +diff --git a/libglob/Makefile b/libglob/Makefile +index c6659c0..7a8f759 100644 +--- a/libglob/Makefile ++++ b/libglob/Makefile +@@ -78,16 +78,25 @@ ifndef CPU + ifeq ($(MACHINE), BePC) + CPU = x86 + else ++ifeq ($(MACHINE), x86_64) ++ CPU = x86 ++else + CPU = ppc + endif + endif ++endif + ifeq ($(MACHINE), BePC) + NATIVE = x86 + CROSS = ppc + else ++ifeq ($(MACHINE), x86_64) ++ NATIVE = x86 ++ CROSS = ppc ++else + NATIVE = ppc + CROSS = x86 + endif ++endif + + # set the object directory + OBJ := obj.$(CPU) +@@ -108,6 +117,8 @@ else + endif + + CFLAGS += -fpic -O3 ++# create the list of include paths ++ INCLUDES = -I. + endif + + ifeq ($(CPU), ppc) +@@ -121,11 +132,10 @@ else + endif + + CFLAGS += -opt full +-endif +- + # create the list of include paths + # -i- forces mwcc to use the given paths for the <> includes, too. + INCLUDES = -i- -I. ++endif + + # specify where to create the application binary + TARGET :=$(OBJ)/$(IMG_NAME) +-- +2.10.2 +