From 63b6e04daea2648755e6dd77801443c4904ad268 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 1 Nov 2018 14:06:49 +0100 Subject: [PATCH] Move GMP spec directories to standard locations Ref #3028 --- .../include/{gmp/32bit => spec/32bit/gmp}/fac_ui.h | 0 .../{gmp/32bit => spec/32bit/gmp}/fib_table.h | 0 .../include/{gmp/32bit => spec/32bit/gmp}/gmp.h | 0 .../include/{gmp/32bit => spec/32bit/gmp}/mp_bases.h | 0 .../include/{gmp/32bit => spec/32bit/gmp}/perfsqr.h | 0 .../include/{gmp/64bit => spec/64bit/gmp}/fac_ui.h | 0 .../{gmp/64bit => spec/64bit/gmp}/fib_table.h | 0 .../include/{gmp/64bit => spec/64bit/gmp}/gmp.h | 0 .../include/{gmp/64bit => spec/64bit/gmp}/mp_bases.h | 0 .../include/{gmp/64bit => spec/64bit/gmp}/perfsqr.h | 0 repos/libports/lib/import/import-gmp.mk | 12 ++++++------ repos/libports/lib/mk/gmp.inc | 1 + repos/libports/ports/gmp.hash | 2 +- repos/libports/ports/gmp.port | 8 ++++---- 14 files changed, 12 insertions(+), 11 deletions(-) rename repos/libports/include/{gmp/32bit => spec/32bit/gmp}/fac_ui.h (100%) rename repos/libports/include/{gmp/32bit => spec/32bit/gmp}/fib_table.h (100%) rename repos/libports/include/{gmp/32bit => spec/32bit/gmp}/gmp.h (100%) rename repos/libports/include/{gmp/32bit => spec/32bit/gmp}/mp_bases.h (100%) rename repos/libports/include/{gmp/32bit => spec/32bit/gmp}/perfsqr.h (100%) rename repos/libports/include/{gmp/64bit => spec/64bit/gmp}/fac_ui.h (100%) rename repos/libports/include/{gmp/64bit => spec/64bit/gmp}/fib_table.h (100%) rename repos/libports/include/{gmp/64bit => spec/64bit/gmp}/gmp.h (100%) rename repos/libports/include/{gmp/64bit => spec/64bit/gmp}/mp_bases.h (100%) rename repos/libports/include/{gmp/64bit => spec/64bit/gmp}/perfsqr.h (100%) diff --git a/repos/libports/include/gmp/32bit/fac_ui.h b/repos/libports/include/spec/32bit/gmp/fac_ui.h similarity index 100% rename from repos/libports/include/gmp/32bit/fac_ui.h rename to repos/libports/include/spec/32bit/gmp/fac_ui.h diff --git a/repos/libports/include/gmp/32bit/fib_table.h b/repos/libports/include/spec/32bit/gmp/fib_table.h similarity index 100% rename from repos/libports/include/gmp/32bit/fib_table.h rename to repos/libports/include/spec/32bit/gmp/fib_table.h diff --git a/repos/libports/include/gmp/32bit/gmp.h b/repos/libports/include/spec/32bit/gmp/gmp.h similarity index 100% rename from repos/libports/include/gmp/32bit/gmp.h rename to repos/libports/include/spec/32bit/gmp/gmp.h diff --git a/repos/libports/include/gmp/32bit/mp_bases.h b/repos/libports/include/spec/32bit/gmp/mp_bases.h similarity index 100% rename from repos/libports/include/gmp/32bit/mp_bases.h rename to repos/libports/include/spec/32bit/gmp/mp_bases.h diff --git a/repos/libports/include/gmp/32bit/perfsqr.h b/repos/libports/include/spec/32bit/gmp/perfsqr.h similarity index 100% rename from repos/libports/include/gmp/32bit/perfsqr.h rename to repos/libports/include/spec/32bit/gmp/perfsqr.h diff --git a/repos/libports/include/gmp/64bit/fac_ui.h b/repos/libports/include/spec/64bit/gmp/fac_ui.h similarity index 100% rename from repos/libports/include/gmp/64bit/fac_ui.h rename to repos/libports/include/spec/64bit/gmp/fac_ui.h diff --git a/repos/libports/include/gmp/64bit/fib_table.h b/repos/libports/include/spec/64bit/gmp/fib_table.h similarity index 100% rename from repos/libports/include/gmp/64bit/fib_table.h rename to repos/libports/include/spec/64bit/gmp/fib_table.h diff --git a/repos/libports/include/gmp/64bit/gmp.h b/repos/libports/include/spec/64bit/gmp/gmp.h similarity index 100% rename from repos/libports/include/gmp/64bit/gmp.h rename to repos/libports/include/spec/64bit/gmp/gmp.h diff --git a/repos/libports/include/gmp/64bit/mp_bases.h b/repos/libports/include/spec/64bit/gmp/mp_bases.h similarity index 100% rename from repos/libports/include/gmp/64bit/mp_bases.h rename to repos/libports/include/spec/64bit/gmp/mp_bases.h diff --git a/repos/libports/include/gmp/64bit/perfsqr.h b/repos/libports/include/spec/64bit/gmp/perfsqr.h similarity index 100% rename from repos/libports/include/gmp/64bit/perfsqr.h rename to repos/libports/include/spec/64bit/gmp/perfsqr.h diff --git a/repos/libports/lib/import/import-gmp.mk b/repos/libports/lib/import/import-gmp.mk index 1d213c7b5d..aabc59d7e6 100644 --- a/repos/libports/lib/import/import-gmp.mk +++ b/repos/libports/lib/import/import-gmp.mk @@ -5,16 +5,16 @@ REP_INC_DIR += include/gmp INC_DIR += $(GMP_PORT_DIR)/include ifeq ($(filter-out $(SPECS),arm),) - REP_INC_DIR += include/gmp/32bit - INC_DIR += $(GMP_PORT_DIR)/include/arm + REP_INC_DIR += include/spec/32bit/gmp + INC_DIR += $(GMP_PORT_DIR)/include/spec/arm endif ifeq ($(filter-out $(SPECS),x86_32),) - REP_INC_DIR += include/gmp/32bit - INC_DIR += $(GMP_PORT_DIR)/include/x86_32 + REP_INC_DIR += include/spec/32bit/gmp + INC_DIR += $(GMP_PORT_DIR)/include/spec/x86_32 endif ifeq ($(filter-out $(SPECS),x86_64),) - REP_INC_DIR += include/gmp/64bit - INC_DIR += $(GMP_PORT_DIR)/include/x86_64 + REP_INC_DIR += include/spec/64bit/gmp + INC_DIR += $(GMP_PORT_DIR)/include/spec/x86_64 endif diff --git a/repos/libports/lib/mk/gmp.inc b/repos/libports/lib/mk/gmp.inc index 6c015e9b3e..afab675c47 100644 --- a/repos/libports/lib/mk/gmp.inc +++ b/repos/libports/lib/mk/gmp.inc @@ -6,4 +6,5 @@ LIBS += libc CC_OPT += -DHAVE_CONFIG_H -D__GMP_WITHIN_GMP +INC_DIR += $(GMP_DIR) INC_DIR += $(REP_DIR)/include/gcc diff --git a/repos/libports/ports/gmp.hash b/repos/libports/ports/gmp.hash index 60f93466c7..3cac82d235 100644 --- a/repos/libports/ports/gmp.hash +++ b/repos/libports/ports/gmp.hash @@ -1 +1 @@ -614ff9d3db2aa667fb6a128edf9fba7e56181a32 +95c8f71ec42c9c8afe05ecbe7425312555171a4f diff --git a/repos/libports/ports/gmp.port b/repos/libports/ports/gmp.port index 9733ca4820..d7f9264043 100644 --- a/repos/libports/ports/gmp.port +++ b/repos/libports/ports/gmp.port @@ -11,7 +11,7 @@ DIR(gmp) := src/lib/gmp DIRS := include DIR_CONTENT(include) := ${DIR(gmp)}/gmp-impl.h -DIRS += $(addprefix include/, x86_32 x86_64 arm) -DIR_CONTENT(include/x86_32) := ${DIR(gmp)}/mpn/x86/pentium/gmp-mparam.h -DIR_CONTENT(include/x86_64) := ${DIR(gmp)}/mpn/x86_64//gmp-mparam.h -DIR_CONTENT(include/arm) := ${DIR(gmp)}/mpn/arm/gmp-mparam.h +DIRS += $(addprefix include/spec/, x86_32 x86_64 arm) +DIR_CONTENT(include/spec/x86_32) := ${DIR(gmp)}/mpn/x86/pentium/gmp-mparam.h +DIR_CONTENT(include/spec/x86_64) := ${DIR(gmp)}/mpn/x86_64/gmp-mparam.h +DIR_CONTENT(include/spec/arm) := ${DIR(gmp)}/mpn/arm/gmp-mparam.h