testing: Make TKM related build recipes future-proof
The tkm scenarios recently failed due to a segmentation fault on my host because I had an old build of the tkm library already built in the build directory. Because the stamp file was not versioned the new release was never checked out or built and charon-tkm was linked against the old version causing a segmentation fault during key derivation.
This commit is contained in:
@@ -8,14 +8,16 @@ PREFIX = /usr/local/ada
|
|||||||
|
|
||||||
all: install
|
all: install
|
||||||
|
|
||||||
.$(PKG)-cloned:
|
$(PKG):
|
||||||
git clone $(SRC) $(PKG)
|
git clone $(SRC) $(PKG)
|
||||||
cd $(PKG) && git checkout $(REV)
|
|
||||||
|
.$(PKG)-cloned-$(REV): $(PKG)
|
||||||
|
cd $(PKG) && git fetch && git checkout $(REV)
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
.$(PKG)-built: .$(PKG)-cloned
|
.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
|
||||||
cd $(PKG) && make LIBRARY_KIND=static
|
cd $(PKG) && make LIBRARY_KIND=static
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
install: .$(PKG)-built
|
install: .$(PKG)-built-$(REV)
|
||||||
cd $(PKG) && make PREFIX=$(PREFIX) LIBRARY_KIND=static install
|
cd $(PKG) && make PREFIX=$(PREFIX) LIBRARY_KIND=static install
|
||||||
|
|||||||
@@ -10,14 +10,16 @@ export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat
|
|||||||
|
|
||||||
all: install
|
all: install
|
||||||
|
|
||||||
.$(PKG)-cloned:
|
$(PKG):
|
||||||
git clone $(SRC) $(PKG)
|
git clone $(SRC) $(PKG)
|
||||||
cd $(PKG) && git checkout $(REV)
|
|
||||||
|
.$(PKG)-cloned-$(REV): $(PKG)
|
||||||
|
cd $(PKG) && git fetch && git checkout $(REV)
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
.$(PKG)-built: .$(PKG)-cloned
|
.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
|
||||||
cd $(PKG) && make
|
cd $(PKG) && make
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
install: .$(PKG)-built
|
install: .$(PKG)-built-$(REV)
|
||||||
cd $(PKG) && make PREFIX=$(PREFIX) install
|
cd $(PKG) && make PREFIX=$(PREFIX) install
|
||||||
|
|||||||
@@ -8,14 +8,16 @@ PREFIX = /usr/local/ada
|
|||||||
|
|
||||||
all: install
|
all: install
|
||||||
|
|
||||||
.$(PKG)-cloned:
|
$(PKG):
|
||||||
git clone $(SRC) $(PKG)
|
git clone $(SRC) $(PKG)
|
||||||
cd $(PKG) && git checkout $(REV)
|
|
||||||
|
.$(PKG)-cloned-$(REV): $(PKG)
|
||||||
|
cd $(PKG) && git fetch && git checkout $(REV)
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
.$(PKG)-built: .$(PKG)-cloned
|
.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
|
||||||
cd $(PKG) && make tests && make
|
cd $(PKG) && make tests && make
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
install: .$(PKG)-built
|
install: .$(PKG)-built-$(REV)
|
||||||
cd $(PKG) && make PREFIX=$(PREFIX) install
|
cd $(PKG) && make PREFIX=$(PREFIX) install
|
||||||
|
|||||||
@@ -10,14 +10,16 @@ export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat
|
|||||||
|
|
||||||
all: install
|
all: install
|
||||||
|
|
||||||
.$(PKG)-cloned:
|
$(PKG):
|
||||||
git clone $(SRC) $(PKG)
|
git clone $(SRC) $(PKG)
|
||||||
cd $(PKG) && git checkout $(REV)
|
|
||||||
|
.$(PKG)-cloned-$(REV): $(PKG)
|
||||||
|
cd $(PKG) && git fetch && git checkout $(REV)
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
.$(PKG)-built: .$(PKG)-cloned
|
.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
|
||||||
cd $(PKG) && make
|
cd $(PKG) && make
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
install: .$(PKG)-built
|
install: .$(PKG)-built-$(REV)
|
||||||
cd $(PKG) && make PREFIX=$(PREFIX) install
|
cd $(PKG) && make PREFIX=$(PREFIX) install
|
||||||
|
|||||||
@@ -8,14 +8,16 @@ export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
|
|||||||
|
|
||||||
all: install
|
all: install
|
||||||
|
|
||||||
.$(PKG)-cloned:
|
$(PKG):
|
||||||
git clone $(SRC) $(PKG)
|
git clone $(SRC) $(PKG)
|
||||||
cd $(PKG) && git checkout $(REV)
|
|
||||||
|
.$(PKG)-cloned-$(REV): $(PKG)
|
||||||
|
cd $(PKG) && git fetch && git checkout $(REV)
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
.$(PKG)-built: .$(PKG)-cloned
|
.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
|
||||||
cd $(PKG) && make
|
cd $(PKG) && make
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
install: .$(PKG)-built
|
install: .$(PKG)-built-$(REV)
|
||||||
cd $(PKG) && make install
|
cd $(PKG) && make install
|
||||||
|
|||||||
@@ -8,14 +8,16 @@ export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
|
|||||||
|
|
||||||
all: install
|
all: install
|
||||||
|
|
||||||
.$(PKG)-cloned:
|
$(PKG):
|
||||||
git clone $(SRC) $(PKG)
|
git clone $(SRC) $(PKG)
|
||||||
cd $(PKG) && git checkout $(REV)
|
|
||||||
|
.$(PKG)-cloned-$(REV): $(PKG)
|
||||||
|
cd $(PKG) && git fetch && git checkout $(REV)
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
.$(PKG)-built: .$(PKG)-cloned
|
.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
|
||||||
cd $(PKG) && make
|
cd $(PKG) && make
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
install: .$(PKG)-built
|
install: .$(PKG)-built-$(REV)
|
||||||
cd $(PKG) && make install
|
cd $(PKG) && make install
|
||||||
|
|||||||
Reference in New Issue
Block a user