diff --git a/gtkd-fix-secondary-arches.patch b/gtkd-fix-secondary-arches.patch new file mode 100644 index 0000000..f3ef851 --- /dev/null +++ b/gtkd-fix-secondary-arches.patch @@ -0,0 +1,41 @@ +--- GtkD-3.3.1/GNUmakefile.orig 2016-11-30 12:09:00.314067964 +0100 ++++ GtkD-3.3.1/GNUmakefile 2016-11-30 12:13:10.087744201 +0100 +@@ -4,7 +4,6 @@ + datadir=$(prefix)/share + + OS=$(shell uname || uname -s) +-ARCH=$(shell uname -m || arch) + + ifndef DC + ifneq ($(strip $(shell which dmd 2>/dev/null)),) +@@ -49,22 +48,6 @@ + LDFLAGS+=$(LINKERFLAG)-ldl + endif + +-ifndef MODEL +- ifeq ("$(ARCH)", "x86_64") +- MODEL=64 +- else +- MODEL=32 +- endif +-endif +- +-ifeq ($(MODEL), 64) +- DCFLAGS+=-m64 +- LDFLAGS+=-m64 +-else +- DCFLAGS+=-m32 +- LDFLAGS+=-m32 +-endif +- + AR=ar + RANLIB=ranlib + +@@ -197,7 +180,6 @@ + # Create a versioned symlink so the demo is able to load it. + + $(BINNAME_DEMO): IMPORTS=-Isrc -Idemos/gtkD/TestWindow +-$(BINNAME_DEMO): DCFLAGS=-m$(MODEL) + $(BINNAME_DEMO): $(OBJECTS_DEMO) + $(if $(wildcard $(SONAME_GTKD)),,$(if $(wildcard $(LIBNAME_GTKD)),,$(MAKE) $(LIBNAME_GTKD))) + $(if $(wildcard $(SONAME_GTKD)),$(eval LDFLAGS+= $(LINKERFLAG)-rpath=./)) diff --git a/gtkd.spec b/gtkd.spec index 2df3ebd..6eff203 100644 --- a/gtkd.spec +++ b/gtkd.spec @@ -12,6 +12,8 @@ Summary: D binding and OO wrapper of GTK+ License: LGPLv3+ with exceptions URL: https://github.com/gtkd-developers/GtkD/ Source0: https://github.com/gtkd-developers/GtkD/archive/v%{version}/%{name}-%{version}.tar.gz +# Fix the build on secondary arches +Patch0: gtkd-fix-secondary-arches.patch ExclusiveArch: %{ldc_arches} @@ -59,6 +61,7 @@ Active l'autocompletion pour pour la bibliothèque gtkd dans geany (IDE) %prep %setup -q -n GtkD-%{version} +%patch0 -p1 # temp geany config directory for allow geany to generate tags mkdir geany_config