From 848a50550cac66a52eebc514e52a2c04f5888d60 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Sun, 7 Oct 2007 13:47:19 +0000 Subject: [PATCH] Standard build for 2007.1 is going to be multilib, make the nomultilib a seperate build. svn path=/trunk/; revision=343 --- specs/2007.1/amd64/hardened/stage1-multilib.spec | 9 --------- specs/2007.1/amd64/hardened/stage1-nomultilib.spec | 9 +++++++++ specs/2007.1/amd64/hardened/stage1.spec | 4 ++-- specs/2007.1/amd64/hardened/stage2-multilib.spec | 9 --------- specs/2007.1/amd64/hardened/stage2-nomultilib.spec | 9 +++++++++ specs/2007.1/amd64/hardened/stage2.spec | 4 ++-- specs/2007.1/amd64/hardened/stage3-multilib.spec | 9 --------- specs/2007.1/amd64/hardened/stage3-nomultilib.spec | 9 +++++++++ specs/2007.1/amd64/hardened/stage3.spec | 4 ++-- 9 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 specs/2007.1/amd64/hardened/stage1-multilib.spec create mode 100644 specs/2007.1/amd64/hardened/stage1-nomultilib.spec delete mode 100644 specs/2007.1/amd64/hardened/stage2-multilib.spec create mode 100644 specs/2007.1/amd64/hardened/stage2-nomultilib.spec delete mode 100644 specs/2007.1/amd64/hardened/stage3-multilib.spec create mode 100644 specs/2007.1/amd64/hardened/stage3-nomultilib.spec diff --git a/specs/2007.1/amd64/hardened/stage1-multilib.spec b/specs/2007.1/amd64/hardened/stage1-multilib.spec deleted file mode 100644 index 23aa6e27..00000000 --- a/specs/2007.1/amd64/hardened/stage1-multilib.spec +++ /dev/null @@ -1,9 +0,0 @@ -subarch: amd64 -target: stage1 -version_stamp: hardened-multilib-2007.1 -rel_type: default -profile: hardened/amd64/multilib -snapshot: 2007.1 -source_subpath: default/stage3-amd64-hardened-multilib-2007.0 -cflags: -O2 -pipe -fforce-addr -cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage1-nomultilib.spec b/specs/2007.1/amd64/hardened/stage1-nomultilib.spec new file mode 100644 index 00000000..2df4a67b --- /dev/null +++ b/specs/2007.1/amd64/hardened/stage1-nomultilib.spec @@ -0,0 +1,9 @@ +subarch: amd64 +target: stage1 +version_stamp: hardened+nomultilib-2007.1 +rel_type: default +profile: hardened/amd64 +snapshot: 2007.1 +source_subpath: default/stage3-amd64-hardened-non-multilib-2007.0 +cflags: -O2 -pipe -fforce-addr +cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage1.spec b/specs/2007.1/amd64/hardened/stage1.spec index a8cd186b..0f4f0c45 100644 --- a/specs/2007.1/amd64/hardened/stage1.spec +++ b/specs/2007.1/amd64/hardened/stage1.spec @@ -2,8 +2,8 @@ subarch: amd64 target: stage1 version_stamp: hardened-2007.1 rel_type: default -profile: hardened/amd64 +profile: hardened/amd64/multilib snapshot: 2007.1 -source_subpath: default/stage3-amd64-hardened-non-multilib-2007.0 +source_subpath: default/stage3-amd64-hardened-multilib-2007.0 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage2-multilib.spec b/specs/2007.1/amd64/hardened/stage2-multilib.spec deleted file mode 100644 index 76be6fcd..00000000 --- a/specs/2007.1/amd64/hardened/stage2-multilib.spec +++ /dev/null @@ -1,9 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: hardened-multilib-2007.1 -rel_type: default -profile: hardened/amd64/multilib -snapshot: 2007.1 -source_subpath: default/stage1-amd64-hardened-multilib-2007.1 -cflags: -O2 -pipe -fforce-addr -cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage2-nomultilib.spec b/specs/2007.1/amd64/hardened/stage2-nomultilib.spec new file mode 100644 index 00000000..2ae717ef --- /dev/null +++ b/specs/2007.1/amd64/hardened/stage2-nomultilib.spec @@ -0,0 +1,9 @@ +subarch: amd64 +target: stage2 +version_stamp: hardened+nomultilib-2007.1 +rel_type: default +profile: hardened/amd64 +snapshot: 2007.1 +source_subpath: default/stage1-amd64-hardened-2007.1 +cflags: -O2 -pipe -fforce-addr +cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage2.spec b/specs/2007.1/amd64/hardened/stage2.spec index 1fb23986..ad8c9d5a 100644 --- a/specs/2007.1/amd64/hardened/stage2.spec +++ b/specs/2007.1/amd64/hardened/stage2.spec @@ -2,8 +2,8 @@ subarch: amd64 target: stage2 version_stamp: hardened-2007.1 rel_type: default -profile: hardened/amd64 +profile: hardened/amd64/multilib snapshot: 2007.1 -source_subpath: default/stage1-amd64-hardened-2007.1 +source_subpath: default/stage1-amd64-hardened-multilib-2007.1 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage3-multilib.spec b/specs/2007.1/amd64/hardened/stage3-multilib.spec deleted file mode 100644 index 413c3a36..00000000 --- a/specs/2007.1/amd64/hardened/stage3-multilib.spec +++ /dev/null @@ -1,9 +0,0 @@ -subarch: amd64 -target: stage3 -version_stamp: hardened-multilib-2007.1 -rel_type: default -profile: hardened/amd64/multilib -snapshot: 2007.1 -source_subpath: default/stage2-amd64-hardened-multilib-2007.1 -cflags: -O2 -pipe -fforce-addr -cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage3-nomultilib.spec b/specs/2007.1/amd64/hardened/stage3-nomultilib.spec new file mode 100644 index 00000000..66a25eca --- /dev/null +++ b/specs/2007.1/amd64/hardened/stage3-nomultilib.spec @@ -0,0 +1,9 @@ +subarch: amd64 +target: stage3 +version_stamp: hardened+nomultilib-2007.1 +rel_type: default +profile: hardened/amd64 +snapshot: 2007.1 +source_subpath: default/stage2-amd64-hardened-2007.1 +cflags: -O2 -pipe -fforce-addr +cxxflags: -O2 -pipe -fforce-addr diff --git a/specs/2007.1/amd64/hardened/stage3.spec b/specs/2007.1/amd64/hardened/stage3.spec index 5fc21e61..d76b4e6b 100644 --- a/specs/2007.1/amd64/hardened/stage3.spec +++ b/specs/2007.1/amd64/hardened/stage3.spec @@ -2,8 +2,8 @@ subarch: amd64 target: stage3 version_stamp: hardened-2007.1 rel_type: default -profile: hardened/amd64 +profile: hardened/amd64/multilib snapshot: 2007.1 -source_subpath: default/stage2-amd64-hardened-2007.1 +source_subpath: default/stage2-amd64-hardened-multilib-2007.1 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr