Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 86ce36d5 authored by SILVA VASCONCELOS Miguel's avatar SILVA VASCONCELOS Miguel
Browse files

rest of files to build

parent 9d75b9a2
No related branches found
Tags 8.13+no
No related merge requests found
File added
0 1.0
11 0.5
20 0.8
LOOPAFTER 1
SET(CTEST_CUSTOM_COVERAGE_EXCLUDE @PATTERN_CTEST_IGNORED@)
\ No newline at end of file
default:
@echo "Existing Targets:"
@echo " make build-deps -> build an image with all possible SimGrid dependencies"
@echo " make stable -> build the latest stable version of SimGrid (with SMPI w/o MC)"
@echo " make unstable -> build the git version of SimGrid (with SMPI, w/o MC)"
@echo " make tuto-s4u -> build all what you need to take the S4U tutorial"
@echo " make tuto-smpi -> build all what you need to take the SMPI tutorial"
@echo " make tuto-mc -> build the git version of SimGrid (with SMPI and MC)"
@echo " make all -> build all but stable (ie, build-deps unstable tuto-s4u tuto-smpi)"
@echo " make push -> push all images to the cloud"
@echo "All our images are based on debian:testing"
@echo "Also possible: DOCKER_EXTRA=--no-cache make unstable"
all: build-deps unstable tuto-s4u tuto-smpi
stable:
# docker build -f Dockerfile.stable --build-arg DLURL=/simgrid/simgrid/uploads/0365f13697fb26eae8c20fc234c5af0e/SimGrid-3.25.tar.gz -t simgrid/stable:latest -t simgrid/stable:v3.25 . |tee stable.log
export last_tag=$$(wget https://framagit.org/simgrid/simgrid/tags 2>/dev/null -O - | grep /simgrid/simgrid/-/tags/v | head -n1 | sed 's/[^>]*>//' | sed 's/<.*//'); \
export DLURL=$$(wget https://framagit.org/simgrid/simgrid/tags/$${last_tag} 2>/dev/null -O - | grep simgrid- | perl -pe 's/.*?<a href="(\/simgrid[^ ]*tar.gz)".*/$1/'); \
echo "DLURL=$$DLURL";\
docker build -f Dockerfile.stable \
--build-arg DLURL=$${DLURL} \
-t simgrid/stable:latest \
-t simgrid/stable:$${last_tag} \
$(DOCKER_EXTRA) \
. | tee stable.log
unstable:
docker build -f Dockerfile.unstable \
-t simgrid/unstable:latest \
-t simgrid/unstable:$$(date --iso-8601) \
$(DOCKER_EXTRA) \
. | tee unstable.log
build-deps:
docker build -f Dockerfile.build-deps \
-t simgrid/build-deps:latest \
-t simgrid/build-deps:$$(date --iso-8601) \
$(DOCKER_EXTRA) \
. | tee build-deps.log
tuto-mc:
docker build -f Dockerfile.tuto-mc \
-t simgrid/tuto-mc:latest \
-t simgrid/tuto-mc:$$(date --iso-8601) \
$(DOCKER_EXTRA) \
. | tee tuto-mc.log
build-deps-stable:
docker build -f Dockerfile.build-deps-stable \
-t simgrid/build-deps-stable:latest \
-t simgrid/build-deps-stable:$$(date --iso-8601) \
$(DOCKER_EXTRA) \
. | tee build-deps-stable.log
tuto-s4u:
docker build -f Dockerfile.tuto-s4u \
-t simgrid/tuto-s4u:latest \
-t simgrid/tuto-s4u:$$(date --iso-8601) \
$(DOCKER_EXTRA) \
. | tee tuto-s4u.log
tuto-smpi:
docker build -f Dockerfile.tuto-smpi \
-t simgrid/tuto-smpi:latest \
-t simgrid/tuto-smpi:$$(date --iso-8601) \
$(DOCKER_EXTRA) \
. | tee tuto-smpi.log
push:
docker push simgrid/build-deps
docker push simgrid/stable
docker push simgrid/unstable
docker push simgrid/tuto-s4u
docker push simgrid/tuto-smpi
docker push simgrid/tuto-mc
This patch is to be applied to the Lua 5.3 source file to get a shared
library. This is because the authors of Lua don't bother distributing
a working build system for their software, so we have to make one...
As unfortunate as it may be, there is nothing else we can do.
-- Da SimGrid team.
diff --git a/Makefile b/Makefile
index 5ee5601..93830a3 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ R= $V.1
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) $@ V=$(V) R=$(R)
test: dummy
src/lua -v
diff --git a/src/Makefile b/src/Makefile
index d71c75c..64bda79 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@
PLAT= none
CC= gcc -std=gnu99
-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
+CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) -fPIC
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS)
@@ -29,6 +29,7 @@ MYOBJS=
PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
LUA_A= liblua.a
+LUA_SO= liblua.so
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
ltm.o lundump.o lvm.o lzio.o
@@ -43,7 +44,7 @@ LUAC_T= luac
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
ALL_A= $(LUA_A)
# Targets start here.
@@ -59,6 +60,11 @@ $(LUA_A): $(BASE_O)
$(AR) $@ $(BASE_O)
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
+ ln -sf $(LUA_SO).$(R) $(LUA_SO)
+
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment