Fossil SCM
Started the process of modifying the build system to permit more flexible and reliable cross-platform support. Currently the build system is set up for Linux (GCC or CLANG as the compiler) and for MinGW32 (GCC as the compiler). Of these, only the Linux builds have been tested so far and confirmed to work as expected. The way to use this new system is as follows: make Builds the default platform and compiler (linux and gcc). PLATFORM=mingw32 make Builds the mingw32 build (untested!) using the default compiler (gcc). COMPILER=clang make Builds the default platform (linux) using the clang compiler. Other platform and compiler fragment files can be added in the ./make directory based on the models already there.
Commit
d3252d7488f229438cea881d99a8bac0e05251f3
Parent
a87fbd331253c71…
6 files changed
+48
-49
-69
+51
+51
+13
+30
M
Makefile
+48
-49
| --- Makefile | ||
| +++ Makefile | ||
| @@ -1,63 +1,62 @@ | ||
| 1 | 1 | #!/usr/bin/make |
| 2 | 2 | # |
| 3 | +#### The directory in which Makefile fragments are stored. | |
| 4 | +# | |
| 5 | +MAKEDIR = ./make | |
| 6 | + | |
| 7 | +#### Set up our compiler if it hasn't already been defined. | |
| 8 | + | |
| 9 | +ifndef COMPILER | |
| 10 | + COMPILER = gcc | |
| 11 | +endif | |
| 12 | + | |
| 13 | +#### Set up our platform if it hasn't already been defined. | |
| 14 | +# | |
| 15 | +ifndef PLATFORM | |
| 16 | + # We default to Linux. | |
| 17 | + # TODO: Figure out how to reliably identify the platform from Make. Sadly the | |
| 18 | + # OSTYPE environment variable isn't carried through into GNU Make, so we | |
| 19 | + # can't do this the obvious way. | |
| 20 | + PLATFORM = linux | |
| 21 | +endif | |
| 22 | + | |
| 3 | 23 | #### The toplevel directory of the source tree. Fossil can be built |
| 4 | 24 | # in a directory that is separate from the source tree. Just change |
| 5 | 25 | # the following to point from the build directory to the src/ folder. |
| 6 | 26 | # |
| 7 | 27 | SRCDIR = ./src |
| 8 | 28 | |
| 9 | -#### The directory into which object code files should be written. | |
| 10 | -# | |
| 11 | -# | |
| 12 | -OBJDIR = ./obj | |
| 13 | - | |
| 14 | -#### C Compiler and options for use in building executables that | |
| 15 | -# will run on the platform that is doing the build. This is used | |
| 16 | -# to compile code-generator programs as part of the build process. | |
| 17 | -# See TCC below for the C compiler for building the finished binary. | |
| 18 | -# | |
| 19 | -#BCC = gcc -g -O2 | |
| 20 | -BCC = clang -g -O2 | |
| 21 | - | |
| 22 | -#### The suffix to add to executable files. ".exe" for windows. | |
| 23 | -# Nothing for unix. | |
| 24 | -# | |
| 25 | -E = | |
| 26 | - | |
| 27 | -#### C Compile and options for use in building executables that | |
| 28 | -# will run on the target platform. This is usually the same | |
| 29 | -# as BCC, unless you are cross-compiling. This C compiler builds | |
| 30 | -# the finished binary for fossil. The BCC compiler above is used | |
| 31 | -# for building intermediate code-generator tools. | |
| 32 | -# | |
| 33 | -#TCC = gcc -O6 | |
| 34 | -#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage | |
| 35 | -#TCC = gcc -g -Os -Wall | |
| 36 | -TCC = clang -g -Os -Wall | |
| 37 | - | |
| 38 | -# To add support for HTTPS | |
| 39 | -TCC += -DFOSSIL_ENABLE_SSL | |
| 40 | - | |
| 41 | -#### Extra arguments for linking the finished binary. Fossil needs | |
| 42 | -# to link against the Z-Lib compression library. There are no | |
| 43 | -# other dependencies. We sometimes add the -static option here | |
| 44 | -# so that we can build a static executable that will run in a | |
| 45 | -# chroot jail. | |
| 46 | -# | |
| 47 | -LIB = -lz $(LDFLAGS) | |
| 48 | -# If you're on OpenSolaris: | |
| 49 | -# LIB += lsocket | |
| 50 | -# Solaris 10 needs: | |
| 51 | -# LIB += -lsocket -lnsl | |
| 52 | -# My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. | |
| 53 | -# | |
| 54 | -# If using HTTPS: | |
| 55 | -LIB += -lcrypto -lssl | |
| 56 | - | |
| 57 | -#### Tcl shell for use in running the fossil testsuite. | |
| 29 | +#### Include the fragments we need from our specific environment. | |
| 30 | +# | |
| 31 | +include $(MAKEDIR)/$(PLATFORM)-fragment.mk | |
| 32 | +include $(MAKEDIR)/$(COMPILER)-fragment.mk | |
| 33 | + | |
| 34 | +#### Include a locale-specific configuration make fragment if present. | |
| 35 | +# Any modification to the platforms' generic setups should be made in this | |
| 36 | +# file where possible. | |
| 37 | +-include config.mk | |
| 38 | + | |
| 39 | +#### The following section beginning after #+++ and ending before #--- is used | |
| 40 | +# inside the $(PLATFORM)-fragment.mk files to turn on the features required | |
| 41 | +# or desired by builds on that platform. They are replicated here for | |
| 42 | +# documentation purposes only and should not be set in this file. | |
| 43 | +#+++ | |
| 44 | +#### The following variable definitions decide which features are turned on or | |
| 45 | +# of when building Fossil. Comment out the features which are not needed by | |
| 46 | +# this platform. | |
| 47 | +# | |
| 48 | +#ENABLE_STATIC = 1 # we want a static build | |
| 49 | +#ENABLE_SSL = 1 # we are using SSL | |
| 50 | +#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 51 | +#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 52 | +#ENABLE_I18N = 1 # we are using i18n settings | |
| 53 | +#--- | |
| 54 | + | |
| 55 | +#### The Tcl shell to run for test suites. | |
| 58 | 56 | # |
| 59 | 57 | TCLSH = tclsh |
| 60 | 58 | |
| 61 | 59 | # You should not need to change anything below this line |
| 62 | 60 | ############################################################################### |
| 63 | 61 | include $(SRCDIR)/main.mk |
| 62 | + | |
| 64 | 63 | |
| 65 | 64 | DELETED Makefile.w32 |
| 66 | 65 | ADDED make/clang-fragment.mk |
| 67 | 66 | ADDED make/gcc-fragment.mk |
| 68 | 67 | ADDED make/linux-fragment.mk |
| 69 | 68 | ADDED make/ming32-fragment.mk |
| --- Makefile | |
| +++ Makefile | |
| @@ -1,63 +1,62 @@ | |
| 1 | #!/usr/bin/make |
| 2 | # |
| 3 | #### The toplevel directory of the source tree. Fossil can be built |
| 4 | # in a directory that is separate from the source tree. Just change |
| 5 | # the following to point from the build directory to the src/ folder. |
| 6 | # |
| 7 | SRCDIR = ./src |
| 8 | |
| 9 | #### The directory into which object code files should be written. |
| 10 | # |
| 11 | # |
| 12 | OBJDIR = ./obj |
| 13 | |
| 14 | #### C Compiler and options for use in building executables that |
| 15 | # will run on the platform that is doing the build. This is used |
| 16 | # to compile code-generator programs as part of the build process. |
| 17 | # See TCC below for the C compiler for building the finished binary. |
| 18 | # |
| 19 | #BCC = gcc -g -O2 |
| 20 | BCC = clang -g -O2 |
| 21 | |
| 22 | #### The suffix to add to executable files. ".exe" for windows. |
| 23 | # Nothing for unix. |
| 24 | # |
| 25 | E = |
| 26 | |
| 27 | #### C Compile and options for use in building executables that |
| 28 | # will run on the target platform. This is usually the same |
| 29 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 30 | # the finished binary for fossil. The BCC compiler above is used |
| 31 | # for building intermediate code-generator tools. |
| 32 | # |
| 33 | #TCC = gcc -O6 |
| 34 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 35 | #TCC = gcc -g -Os -Wall |
| 36 | TCC = clang -g -Os -Wall |
| 37 | |
| 38 | # To add support for HTTPS |
| 39 | TCC += -DFOSSIL_ENABLE_SSL |
| 40 | |
| 41 | #### Extra arguments for linking the finished binary. Fossil needs |
| 42 | # to link against the Z-Lib compression library. There are no |
| 43 | # other dependencies. We sometimes add the -static option here |
| 44 | # so that we can build a static executable that will run in a |
| 45 | # chroot jail. |
| 46 | # |
| 47 | LIB = -lz $(LDFLAGS) |
| 48 | # If you're on OpenSolaris: |
| 49 | # LIB += lsocket |
| 50 | # Solaris 10 needs: |
| 51 | # LIB += -lsocket -lnsl |
| 52 | # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. |
| 53 | # |
| 54 | # If using HTTPS: |
| 55 | LIB += -lcrypto -lssl |
| 56 | |
| 57 | #### Tcl shell for use in running the fossil testsuite. |
| 58 | # |
| 59 | TCLSH = tclsh |
| 60 | |
| 61 | # You should not need to change anything below this line |
| 62 | ############################################################################### |
| 63 | include $(SRCDIR)/main.mk |
| 64 | |
| 65 | ELETED Makefile.w32 |
| 66 | DDED make/clang-fragment.mk |
| 67 | DDED make/gcc-fragment.mk |
| 68 | DDED make/linux-fragment.mk |
| 69 | DDED make/ming32-fragment.mk |
| --- Makefile | |
| +++ Makefile | |
| @@ -1,63 +1,62 @@ | |
| 1 | #!/usr/bin/make |
| 2 | # |
| 3 | #### The directory in which Makefile fragments are stored. |
| 4 | # |
| 5 | MAKEDIR = ./make |
| 6 | |
| 7 | #### Set up our compiler if it hasn't already been defined. |
| 8 | |
| 9 | ifndef COMPILER |
| 10 | COMPILER = gcc |
| 11 | endif |
| 12 | |
| 13 | #### Set up our platform if it hasn't already been defined. |
| 14 | # |
| 15 | ifndef PLATFORM |
| 16 | # We default to Linux. |
| 17 | # TODO: Figure out how to reliably identify the platform from Make. Sadly the |
| 18 | # OSTYPE environment variable isn't carried through into GNU Make, so we |
| 19 | # can't do this the obvious way. |
| 20 | PLATFORM = linux |
| 21 | endif |
| 22 | |
| 23 | #### The toplevel directory of the source tree. Fossil can be built |
| 24 | # in a directory that is separate from the source tree. Just change |
| 25 | # the following to point from the build directory to the src/ folder. |
| 26 | # |
| 27 | SRCDIR = ./src |
| 28 | |
| 29 | #### Include the fragments we need from our specific environment. |
| 30 | # |
| 31 | include $(MAKEDIR)/$(PLATFORM)-fragment.mk |
| 32 | include $(MAKEDIR)/$(COMPILER)-fragment.mk |
| 33 | |
| 34 | #### Include a locale-specific configuration make fragment if present. |
| 35 | # Any modification to the platforms' generic setups should be made in this |
| 36 | # file where possible. |
| 37 | -include config.mk |
| 38 | |
| 39 | #### The following section beginning after #+++ and ending before #--- is used |
| 40 | # inside the $(PLATFORM)-fragment.mk files to turn on the features required |
| 41 | # or desired by builds on that platform. They are replicated here for |
| 42 | # documentation purposes only and should not be set in this file. |
| 43 | #+++ |
| 44 | #### The following variable definitions decide which features are turned on or |
| 45 | # of when building Fossil. Comment out the features which are not needed by |
| 46 | # this platform. |
| 47 | # |
| 48 | #ENABLE_STATIC = 1 # we want a static build |
| 49 | #ENABLE_SSL = 1 # we are using SSL |
| 50 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 51 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 52 | #ENABLE_I18N = 1 # we are using i18n settings |
| 53 | #--- |
| 54 | |
| 55 | #### The Tcl shell to run for test suites. |
| 56 | # |
| 57 | TCLSH = tclsh |
| 58 | |
| 59 | # You should not need to change anything below this line |
| 60 | ############################################################################### |
| 61 | include $(SRCDIR)/main.mk |
| 62 | |
| 63 | |
| 64 | ELETED Makefile.w32 |
| 65 | DDED make/clang-fragment.mk |
| 66 | DDED make/gcc-fragment.mk |
| 67 | DDED make/linux-fragment.mk |
| 68 | DDED make/ming32-fragment.mk |
D
Makefile.w32
-69
| --- a/Makefile.w32 | ||
| +++ b/Makefile.w32 | ||
| @@ -1,69 +0,0 @@ | ||
| 1 | -#!/usr/bin/make | |
| 2 | -# | |
| 3 | -#### The toplevel directory of the source tree. Fossil can be built | |
| 4 | -# in a directory that is separate from the source tree. Just change | |
| 5 | -# the following to point from the build direcSRCDIR = ./src | |
| 6 | -OBJDIR = ./SEP)src | |
| 7 | -OBJDIR = .$(DIRSEP)wobj | |
| 8 | - | |
| 9 | -#### C Compiler and options for use in building executables that | |
| 10 | -# will run on the platform that is doing the build. This is used | |
| 11 | -# to compile code-generator programs as part of the build process. | |
| 12 | -# See TCC below for the C compiler for building the finished binary. | |
| 13 | -# | |
| 14 | -BCC = gcc -g -O2 | |
| 15 | - | |
| 16 | -#### The suffix to add to executable files. ".exe" for windows. | |
| 17 | -# Nothing for unix. | |
| 18 | -# | |
| 19 | -E = .exe | |
| 20 | - | |
| 21 | -#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) | |
| 22 | -# | |
| 23 | -# FOSSIL_ENABLE_SSL=1 | |
| 24 | - | |
| 25 | -#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) | |
| 26 | -# | |
| 27 | -# FOSSIL_ENABLE_SSL=1 | |
| 28 | - | |
| 29 | -#### C Compile and options for use in building executables that | |
| 30 | -# will run on the target platform. This is usually the same | |
| 31 | -# as BCC, unless you are cross-compiling. This C compiler builds | |
| 32 | -# the finished binary for fossil. The BCC compiler above is used | |
| 33 | -# for building intermediate code-generator tools. | |
| 34 | -# | |
| 35 | -#TCC = gcc -O6 | |
| 36 | -#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage | |
| 37 | -#TCC = gcc -g -Os -Wall | |
| 38 | -#TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include | |
| 39 | -TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L/mingw/lib -I/mingw/include | |
| 40 | - | |
| 41 | -# With HTTPS support | |
| 42 | -ifdef FOSSIL_ENABLE_SSL | |
| 43 | -TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 44 | -endif | |
| 45 | - | |
| 46 | -#### Extra arguments for linking the finished binary. Fossil needs | |
| 47 | -# to link against the Z-Lib compression library. There are no | |
| 48 | -# other dependencies. We sometimes add the -static option here | |
| 49 | -# so that we can build a static executable that will run in a | |
| 50 | -# chroot jail. | |
| 51 | -# | |
| 52 | -#LIB = -lz | |
| 53 | -#LIB = -lz -lws2_32 | |
| 54 | -LIB = -lmingwex -lz -lws2_32 | |
| 55 | -# OpenSSL: | |
| 56 | -ifdef FOSSIL_ENABLE_SSL | |
| 57 | -LIB += -lcrypto -lssl | |
| 58 | -endif | |
| 59 | - | |
| 60 | -#### Tcl shell for use in running the fossil testsuite. | |
| 61 | -# | |
| 62 | -TCLSH = tclsh | |
| 63 | - | |
| 64 | -#### Include a configuration file that can override any one of these settings. | |
| 65 | -# | |
| 66 | --include config.w32 | |
| 67 | - | |
| 68 | -# You should not need to change anything below this line | |
| 69 | -#################################################### |
| --- a/Makefile.w32 | |
| +++ b/Makefile.w32 | |
| @@ -1,69 +0,0 @@ | |
| 1 | #!/usr/bin/make |
| 2 | # |
| 3 | #### The toplevel directory of the source tree. Fossil can be built |
| 4 | # in a directory that is separate from the source tree. Just change |
| 5 | # the following to point from the build direcSRCDIR = ./src |
| 6 | OBJDIR = ./SEP)src |
| 7 | OBJDIR = .$(DIRSEP)wobj |
| 8 | |
| 9 | #### C Compiler and options for use in building executables that |
| 10 | # will run on the platform that is doing the build. This is used |
| 11 | # to compile code-generator programs as part of the build process. |
| 12 | # See TCC below for the C compiler for building the finished binary. |
| 13 | # |
| 14 | BCC = gcc -g -O2 |
| 15 | |
| 16 | #### The suffix to add to executable files. ".exe" for windows. |
| 17 | # Nothing for unix. |
| 18 | # |
| 19 | E = .exe |
| 20 | |
| 21 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 22 | # |
| 23 | # FOSSIL_ENABLE_SSL=1 |
| 24 | |
| 25 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 26 | # |
| 27 | # FOSSIL_ENABLE_SSL=1 |
| 28 | |
| 29 | #### C Compile and options for use in building executables that |
| 30 | # will run on the target platform. This is usually the same |
| 31 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 32 | # the finished binary for fossil. The BCC compiler above is used |
| 33 | # for building intermediate code-generator tools. |
| 34 | # |
| 35 | #TCC = gcc -O6 |
| 36 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 37 | #TCC = gcc -g -Os -Wall |
| 38 | #TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include |
| 39 | TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L/mingw/lib -I/mingw/include |
| 40 | |
| 41 | # With HTTPS support |
| 42 | ifdef FOSSIL_ENABLE_SSL |
| 43 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 44 | endif |
| 45 | |
| 46 | #### Extra arguments for linking the finished binary. Fossil needs |
| 47 | # to link against the Z-Lib compression library. There are no |
| 48 | # other dependencies. We sometimes add the -static option here |
| 49 | # so that we can build a static executable that will run in a |
| 50 | # chroot jail. |
| 51 | # |
| 52 | #LIB = -lz |
| 53 | #LIB = -lz -lws2_32 |
| 54 | LIB = -lmingwex -lz -lws2_32 |
| 55 | # OpenSSL: |
| 56 | ifdef FOSSIL_ENABLE_SSL |
| 57 | LIB += -lcrypto -lssl |
| 58 | endif |
| 59 | |
| 60 | #### Tcl shell for use in running the fossil testsuite. |
| 61 | # |
| 62 | TCLSH = tclsh |
| 63 | |
| 64 | #### Include a configuration file that can override any one of these settings. |
| 65 | # |
| 66 | -include config.w32 |
| 67 | |
| 68 | # You should not need to change anything below this line |
| 69 | #################################################### |
| --- a/Makefile.w32 | |
| +++ b/Makefile.w32 | |
| @@ -1,69 +0,0 @@ | |
+51
| --- a/make/clang-fragment.mk | ||
| +++ b/make/clang-fragment.mk | ||
| @@ -0,0 +1,51 @@ | ||
| 1 | +#### C Compiler and options for use in building executables that | |
| 2 | +# will run on the platform that is doing the build. This is used | |
| 3 | +# to compile code-generator programs as part of the build process. | |
| 4 | +# See TCC below for the C compiler for building the finished binary. | |
| 5 | +# | |
| 6 | +BCC = clang -g -O2 | |
| 7 | + | |
| 8 | +#### C Compile and options for use in building executables that | |
| 9 | +# will run on the target platform. This is usually the same | |
| 10 | +# as BCC, unless you are cross-compiling. This C compiler builds | |
| 11 | +# the finished binary for fossil. The BCC compiler above is used | |
| 12 | +# for building intermediate code-generator tools. | |
| 13 | +# | |
| 14 | +TCC = clang -g -Os -Wall | |
| 15 | + | |
| 16 | +#### Compiler options. | |
| 17 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 18 | +# | |
| 19 | +ifdef ENABLE_SSL | |
| 20 | + TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 21 | +endif | |
| 22 | +ifndef ENABLE_I18N | |
| 23 | + TCC += -DFOSSIL_I18N=0 | |
| 24 | +endif | |
| 25 | +ifdef PLATFORM_SPECIFIC_CLANG | |
| 26 | + TCC += $(PLATFORM_SPECIFIC_CLANG) | |
| 27 | +endif | |
| 28 | + | |
| 29 | +#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 30 | +# All other library settings are optional and toggled in platform-specific | |
| 31 | +# make fragments. | |
| 32 | +# | |
| 33 | +LIB = -lz $(LDFLAGS) | |
| 34 | + | |
| 35 | +#### Linker options. | |
| 36 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 37 | +# | |
| 38 | +ifdef ENABLE_STATIC | |
| 39 | + LIB += -static | |
| 40 | +endif | |
| 41 | +ifdef ENABLE_SSL | |
| 42 | + LIB += -lcrypto -lssl | |
| 43 | +endif | |
| 44 | +ifdef ENABLE_SOCKET | |
| 45 | + LIB += -lsocket | |
| 46 | +endif | |
| 47 | +ifdef ENABLE_NSL | |
| 48 | + LIB += -lnsl | |
| 49 | +endif | |
| 50 | +ifdef PLATFORM_SPECIFIC_LIB | |
| 51 | + TCC |
| --- a/make/clang-fragment.mk | |
| +++ b/make/clang-fragment.mk | |
| @@ -0,0 +1,51 @@ | |
| --- a/make/clang-fragment.mk | |
| +++ b/make/clang-fragment.mk | |
| @@ -0,0 +1,51 @@ | |
| 1 | #### C Compiler and options for use in building executables that |
| 2 | # will run on the platform that is doing the build. This is used |
| 3 | # to compile code-generator programs as part of the build process. |
| 4 | # See TCC below for the C compiler for building the finished binary. |
| 5 | # |
| 6 | BCC = clang -g -O2 |
| 7 | |
| 8 | #### C Compile and options for use in building executables that |
| 9 | # will run on the target platform. This is usually the same |
| 10 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 11 | # the finished binary for fossil. The BCC compiler above is used |
| 12 | # for building intermediate code-generator tools. |
| 13 | # |
| 14 | TCC = clang -g -Os -Wall |
| 15 | |
| 16 | #### Compiler options. |
| 17 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 18 | # |
| 19 | ifdef ENABLE_SSL |
| 20 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 21 | endif |
| 22 | ifndef ENABLE_I18N |
| 23 | TCC += -DFOSSIL_I18N=0 |
| 24 | endif |
| 25 | ifdef PLATFORM_SPECIFIC_CLANG |
| 26 | TCC += $(PLATFORM_SPECIFIC_CLANG) |
| 27 | endif |
| 28 | |
| 29 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 30 | # All other library settings are optional and toggled in platform-specific |
| 31 | # make fragments. |
| 32 | # |
| 33 | LIB = -lz $(LDFLAGS) |
| 34 | |
| 35 | #### Linker options. |
| 36 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 37 | # |
| 38 | ifdef ENABLE_STATIC |
| 39 | LIB += -static |
| 40 | endif |
| 41 | ifdef ENABLE_SSL |
| 42 | LIB += -lcrypto -lssl |
| 43 | endif |
| 44 | ifdef ENABLE_SOCKET |
| 45 | LIB += -lsocket |
| 46 | endif |
| 47 | ifdef ENABLE_NSL |
| 48 | LIB += -lnsl |
| 49 | endif |
| 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | TCC |
+51
| --- a/make/gcc-fragment.mk | ||
| +++ b/make/gcc-fragment.mk | ||
| @@ -0,0 +1,51 @@ | ||
| 1 | +#### C Compiler and options for use in building executables that | |
| 2 | +# will run on the platform that is doing the build. This is used | |
| 3 | +# to compile code-generator programs as part of the build process. | |
| 4 | +# See TCC below for the C compiler for building the finished binary. | |
| 5 | +# | |
| 6 | +BCC = gcc -g -O2 | |
| 7 | + | |
| 8 | +#### C Compile and options for use in building executables that | |
| 9 | +# will run on the target platform. This is usually the same | |
| 10 | +# as BCC, unless you are cross-compiling. This C compiler builds | |
| 11 | +# the finished binary for fossil. The BCC compiler above is used | |
| 12 | +# for building intermediate code-generator tools. | |
| 13 | +# | |
| 14 | +TCC = gcc -g -Os -Wall | |
| 15 | + | |
| 16 | +#### Compiler options. | |
| 17 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 18 | +# | |
| 19 | +ifdef ENABLE_SSL | |
| 20 | + TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 21 | +endif | |
| 22 | +ifndef ENABLE_I18N | |
| 23 | + TCC += -DFOSSIL_I18N=0 | |
| 24 | +endif | |
| 25 | +ifdef PLATFORM_SPECIFIC_GCC | |
| 26 | + TCC += $(PLATFORM_SPECIFIC_GCC) | |
| 27 | +endif | |
| 28 | + | |
| 29 | +#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 30 | +# All other library settings are optional and toggled in platform-specific | |
| 31 | +# make fragments. | |
| 32 | +# | |
| 33 | +LIB = -lz $(LDFLAGS) | |
| 34 | + | |
| 35 | +#### Linker options. | |
| 36 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 37 | +# | |
| 38 | +ifdef ENABLE_STATIC | |
| 39 | + LIB += -static | |
| 40 | +endif | |
| 41 | +ifdef ENABLE_SSL | |
| 42 | + LIB += -lcrypto -lssl | |
| 43 | +endif | |
| 44 | +ifdef ENABLE_SOCKET | |
| 45 | + LIB += -lsocket | |
| 46 | +endif | |
| 47 | +ifdef ENABLE_NSL | |
| 48 | + LIB += -lnsl | |
| 49 | +endif | |
| 50 | +ifdef PLATFORM_SPECIFIC_LIB | |
| 51 | + ef PLATFORM_ |
| --- a/make/gcc-fragment.mk | |
| +++ b/make/gcc-fragment.mk | |
| @@ -0,0 +1,51 @@ | |
| --- a/make/gcc-fragment.mk | |
| +++ b/make/gcc-fragment.mk | |
| @@ -0,0 +1,51 @@ | |
| 1 | #### C Compiler and options for use in building executables that |
| 2 | # will run on the platform that is doing the build. This is used |
| 3 | # to compile code-generator programs as part of the build process. |
| 4 | # See TCC below for the C compiler for building the finished binary. |
| 5 | # |
| 6 | BCC = gcc -g -O2 |
| 7 | |
| 8 | #### C Compile and options for use in building executables that |
| 9 | # will run on the target platform. This is usually the same |
| 10 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 11 | # the finished binary for fossil. The BCC compiler above is used |
| 12 | # for building intermediate code-generator tools. |
| 13 | # |
| 14 | TCC = gcc -g -Os -Wall |
| 15 | |
| 16 | #### Compiler options. |
| 17 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 18 | # |
| 19 | ifdef ENABLE_SSL |
| 20 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 21 | endif |
| 22 | ifndef ENABLE_I18N |
| 23 | TCC += -DFOSSIL_I18N=0 |
| 24 | endif |
| 25 | ifdef PLATFORM_SPECIFIC_GCC |
| 26 | TCC += $(PLATFORM_SPECIFIC_GCC) |
| 27 | endif |
| 28 | |
| 29 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 30 | # All other library settings are optional and toggled in platform-specific |
| 31 | # make fragments. |
| 32 | # |
| 33 | LIB = -lz $(LDFLAGS) |
| 34 | |
| 35 | #### Linker options. |
| 36 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 37 | # |
| 38 | ifdef ENABLE_STATIC |
| 39 | LIB += -static |
| 40 | endif |
| 41 | ifdef ENABLE_SSL |
| 42 | LIB += -lcrypto -lssl |
| 43 | endif |
| 44 | ifdef ENABLE_SOCKET |
| 45 | LIB += -lsocket |
| 46 | endif |
| 47 | ifdef ENABLE_NSL |
| 48 | LIB += -lnsl |
| 49 | endif |
| 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | ef PLATFORM_ |
+13
| --- a/make/linux-fragment.mk | ||
| +++ b/make/linux-fragment.mk | ||
| @@ -0,0 +1,13 @@ | ||
| 1 | +#### The suffix to add to executable files. ".exe" for windows. | |
| 2 | +# Nothing for unix. | |
| 3 | +# | |
| 4 | +E = | |
| 5 | + | |
| 6 | +#### The directory into which object code files should be written. | |
| 7 | +# | |
| 8 | +OBJDIR = ./obj | |
| 9 | + | |
| 10 | +#### The following variable definitions decide which features are turned on or | |
| 11 | +# of when building Fossil. Comment out the features which are not needeENABLE_SSL = 1 # we are using SSL | |
| 12 | +g libnsl lfeatures | |
| 13 | + |
| --- a/make/linux-fragment.mk | |
| +++ b/make/linux-fragment.mk | |
| @@ -0,0 +1,13 @@ | |
| --- a/make/linux-fragment.mk | |
| +++ b/make/linux-fragment.mk | |
| @@ -0,0 +1,13 @@ | |
| 1 | #### The suffix to add to executable files. ".exe" for windows. |
| 2 | # Nothing for unix. |
| 3 | # |
| 4 | E = |
| 5 | |
| 6 | #### The directory into which object code files should be written. |
| 7 | # |
| 8 | OBJDIR = ./obj |
| 9 | |
| 10 | #### The following variable definitions decide which features are turned on or |
| 11 | # of when building Fossil. Comment out the features which are not needeENABLE_SSL = 1 # we are using SSL |
| 12 | g libnsl lfeatures |
| 13 |
+30
| --- a/make/ming32-fragment.mk | ||
| +++ b/make/ming32-fragment.mk | ||
| @@ -0,0 +1,30 @@ | ||
| 1 | +#### The suffix to add to executable files. | |
| 2 | +# | |
| 3 | +E = .exe | |
| 4 | + | |
| 5 | +#### The directory into which object code files should be written. | |
| 6 | +# | |
| 7 | +OBJDIR = ./wobj | |
| 8 | + | |
| 9 | +#### The following variable definitions decide which features are turned on or | |
| 10 | +# of when building Fossil. Comment out the features which are not needed by | |
| 11 | +# this platform. | |
| 12 | +# | |
| 13 | +ENABLE_STATIC = | |
| 14 | +#### The following features must be added to the GCC and LD builds espectively. | |
| 15 | +# | |
| 16 | +ifndef MINGW32_GCC | |
| 17 | +PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include | |
| 18 | +else | |
| 19 | +PLA32_GCC) | |
| 20 | +endif | |
| 21 | + | |
| 22 | +ifndef MING32_GCC) | |
| 23 | +endif | |
| 24 | + | |
| 25 | +ifndef MINGW32_LIB | |
| 26 | +PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32 | |
| 27 | +else | |
| 28 | +PLA32_LIB) | |
| 29 | +endif | |
| 30 | + |
| --- a/make/ming32-fragment.mk | |
| +++ b/make/ming32-fragment.mk | |
| @@ -0,0 +1,30 @@ | |
| --- a/make/ming32-fragment.mk | |
| +++ b/make/ming32-fragment.mk | |
| @@ -0,0 +1,30 @@ | |
| 1 | #### The suffix to add to executable files. |
| 2 | # |
| 3 | E = .exe |
| 4 | |
| 5 | #### The directory into which object code files should be written. |
| 6 | # |
| 7 | OBJDIR = ./wobj |
| 8 | |
| 9 | #### The following variable definitions decide which features are turned on or |
| 10 | # of when building Fossil. Comment out the features which are not needed by |
| 11 | # this platform. |
| 12 | # |
| 13 | ENABLE_STATIC = |
| 14 | #### The following features must be added to the GCC and LD builds espectively. |
| 15 | # |
| 16 | ifndef MINGW32_GCC |
| 17 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 18 | else |
| 19 | PLA32_GCC) |
| 20 | endif |
| 21 | |
| 22 | ifndef MING32_GCC) |
| 23 | endif |
| 24 | |
| 25 | ifndef MINGW32_LIB |
| 26 | PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32 |
| 27 | else |
| 28 | PLA32_LIB) |
| 29 | endif |
| 30 |