summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2016-02-26 13:12:09 +0000
committerPeter Powell <petpow@saberuk.com>2016-04-04 13:20:21 +0100
commit30bd7bb39fb55a4b6b3075a1f8a7df47bc0e261f (patch)
tree23119a89eb97f752cb68fd6e3bad69aa1000663d
parent932748db6dd2a7225c9f12bc34339fcb2f37c319 (diff)
Rename PURE_STATIC to INSPIRCD_STATIC.
-rw-r--r--include/modules.h2
-rwxr-xr-xmake/calcdep.pl2
-rw-r--r--make/template/main.mk10
-rw-r--r--src/coremods/core_info/cmd_modules.cpp2
-rw-r--r--src/modmanager_dynamic.cpp2
-rw-r--r--src/modmanager_static.cpp2
-rwxr-xr-xtools/test-build4
7 files changed, 12 insertions, 12 deletions
diff --git a/include/modules.h b/include/modules.h
index 46aa13e40..e836f19dd 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1235,7 +1235,7 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
#define MODULE_INIT_SYM_FN_2(x,y) MODULE_INIT_SYM_FN_1(x,y)
#define MODULE_INIT_SYM_FN_1(x,y) inspircd_module_ ## x ## _ ## y
-#ifdef PURE_STATIC
+#ifdef INSPIRCD_STATIC
struct AllCommandList {
typedef Command* (*fn)(Module*);
diff --git a/make/calcdep.pl b/make/calcdep.pl
index 65e19773e..f8f50497e 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -57,7 +57,7 @@ sub run() {
open MAKE, '>real.mk' or die "Could not write real.mk: $!";
chdir "${\SOURCEPATH}/src";
- if ($ENV{PURE_STATIC}) {
+ if ($ENV{INSPIRCD_STATIC}) {
run_static();
} else {
run_dynamic();
diff --git a/make/template/main.mk b/make/template/main.mk
index 7b153a924..73ebbd53e 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -122,8 +122,8 @@ FOOTER = finishmessage
VERBOSE =
@ENDIF
-@IFDEF PURE_STATIC
- CORECXXFLAGS += -DPURE_STATIC
+@IFDEF INSPIRCD_STATIC
+ CORECXXFLAGS += -DINSPIRCD_STATIC
@ENDIF
# Add the users CXXFLAGS to the base ones to allow them to override
@@ -131,7 +131,7 @@ FOOTER = finishmessage
CORECXXFLAGS += $(CXXFLAGS)
@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
-@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC
+@DO_EXPORT SOURCEPATH BUILDPATH INSPIRCD_STATIC
# Default target
TARGET = all
@@ -177,7 +177,7 @@ debug-header:
@echo "*************************************"
mod-header:
-@IFDEF PURE_STATIC
+@IFDEF INSPIRCD_STATIC
@echo 'Cannot build single modules in pure-static build'
@exit 1
@ENDIF
@@ -226,7 +226,7 @@ install: target
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
-@IFNDEF PURE_STATIC
+@IFNDEF INSPIRCD_STATIC
[ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
@ENDIF
-$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(BASE) 2>/dev/null
diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 5f02d071f..ef1ee7dbe 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -64,7 +64,7 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
if (!(V.Flags & mult))
flags[pos] = '-';
-#ifdef PURE_STATIC
+#ifdef INSPIRCD_STATIC
user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str()));
#else
std::string srcrev = m->ModuleDLLManager->GetVersion();
diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 9a687ad2b..9e940cc32 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -25,7 +25,7 @@
#include <dirent.h>
#endif
-#ifndef PURE_STATIC
+#ifndef INSPIRCD_STATIC
bool ModuleManager::Load(const std::string& modname, bool defer)
{
diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index 98ed26c67..5c04a7680 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -23,7 +23,7 @@
#include "exitcodes.h"
#include <iostream>
-#ifdef PURE_STATIC
+#ifdef INSPIRCD_STATIC
typedef std::map<std::string, AllModuleList*> modmap;
static std::vector<AllCommandList::fn>* cmdlist = NULL;
diff --git a/tools/test-build b/tools/test-build
index b0eb255c0..146880fe6 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -56,12 +56,12 @@ foreach my $compiler (@compilers) {
say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
exit 1;
}
- $ENV{PURE_STATIC} = 1;
+ $ENV{INSPIRCD_STATIC} = 1;
if (system 'make', '-j'.get_cpu_count, 'install') {
say "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!";
exit 1;
}
- delete $ENV{PURE_STATIC};
+ delete $ENV{INSPIRCD_STATIC};
if (system 'make', '-j'.get_cpu_count, 'install') {
say "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!";
exit 1;