diff --git a/configure.py b/configure.py index bfdbe2b..995061e 100644 --- a/configure.py +++ b/configure.py @@ -129,7 +129,7 @@ def set_defaults(): "cygwin": "cygwin-g++", "darwin": "macx-g++", "dgux": "dgux-g++", - "freebsd": "freebsd-g++", + "freebsd": "freebsd-clang", "gnu": "hurd-g++", "hp-ux": "hpux-acc", "irix": "irix-cc", @@ -207,7 +207,7 @@ def set_platform_directories(): plat_py_lib_dir = lib_dir + "/config" plat_bin_dir = sys.exec_prefix + "/bin" - plat_sip_dir = sys.prefix + "/share/sip" + plat_sip_dir = sys.prefix + "/share/tdesip" def create_config(module, template, macros): @@ -225,7 +225,7 @@ def create_config(module, template, macros): "sip_version": sip_version, "sip_version_str": sip_version_str, "platform": opts.platform, - "sip_bin": os.path.join(opts.sipbindir, "sip"), + "sip_bin": os.path.join(opts.sipbindir, "tdesip"), "sip_inc_dir": opts.sipincdir, "sip_mod_dir": opts.sipmoddir, "default_bin_dir": plat_bin_dir, @@ -286,7 +286,7 @@ def create_makefiles(macros, extra_lib_dir=None, extra_libs=None): build_file=os.path.join(src_dir, "siplib", "siplib.sbf"), dir="siplib", install_dir=cfg.sip_mod_dir, - installs=([os.path.join(src_dir, "siplib", "sip.h")], cfg.sip_inc_dir), + installs=([os.path.join(src_dir, "siplib", "tdesip.h")], cfg.sip_inc_dir), console=1, warnings=0, static=opts.static, @@ -389,7 +389,10 @@ def main(argv): argv is the list of command line arguments. """ - siputils.inform("This is SIP %s for Python %s on %s." % (sip_version_str, sys.version.split()[0], sys.platform)) + if sys.platform == 'linux2': + PlatForm = "GNU/Linux" + + siputils.inform("This is SIP %s for Python %s on %s platform." % (sip_version_str, sys.version.split()[0], PlatForm)) if py_version < 0x020300: siputils.error("This version of SIP requires Python v2.3 or later.") diff --git a/sipgen/gencode.c b/sipgen/gencode.c index f7d239e..459029b 100644 --- a/sipgen/gencode.c +++ b/sipgen/gencode.c @@ -496,7 +496,7 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod, "#define _%sAPI_H\n" "\n" "\n" -"#include \n" +"#include \n" , mname , mname); diff --git a/sipgen/sipgen.sbf b/sipgen/sipgen.sbf index 3542663..681075f 100644 --- a/sipgen/sipgen.sbf +++ b/sipgen/sipgen.sbf @@ -14,6 +14,6 @@ # SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -target = sip +target = tdesip sources = main.c transform.c gencode.c export.c heap.c parser.c lexer.c headers = sip.h parser.h diff --git a/siplib/apiversions.c b/siplib/apiversions.c index 7d86c76..985f3b4 100644 --- a/siplib/apiversions.c +++ b/siplib/apiversions.c @@ -21,7 +21,7 @@ #include -#include "sip.h" +#include "tdesip.h" #include "sipint.h" diff --git a/siplib/descriptors.c b/siplib/descriptors.c index 29277c5..02273ec 100644 --- a/siplib/descriptors.c +++ b/siplib/descriptors.c @@ -19,7 +19,7 @@ #include -#include "sip.h" +#include "tdesip.h" #include "sipint.h" diff --git a/siplib/objmap.c b/siplib/objmap.c index f9c196d..4f6dff8 100644 --- a/siplib/objmap.c +++ b/siplib/objmap.c @@ -20,7 +20,7 @@ #include -#include "sip.h" +#include "tdesip.h" #include "sipint.h" diff --git a/siplib/siplib.c b/siplib/siplib.c index d43f121..790f7b0 100644 --- a/siplib/siplib.c +++ b/siplib/siplib.c @@ -25,7 +25,7 @@ #include #include -#include "sip.h" +#include "tdesip.h" #include "sipint.h" diff --git a/siplib/siplib.sbf b/siplib/siplib.sbf index 2e17ba5..16d6573 100644 --- a/siplib/siplib.sbf +++ b/siplib/siplib.sbf @@ -14,6 +14,6 @@ # SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -target = sip +target = tdesip sources = siplib.c apiversions.c descriptors.c tqtlib.c threads.c objmap.c voidptr.c bool.cpp -headers = sip.h sipint.h +headers = tdesip.h sipint.h diff --git a/siplib/sip.h b/siplib/tdesip.h similarity index 100% rename from siplib/sip.h rename to siplib/tdesip.h diff --git a/siplib/threads.c b/siplib/threads.c index 0854a0a..7c1948b 100644 --- a/siplib/threads.c +++ b/siplib/threads.c @@ -19,7 +19,7 @@ */ -#include "sip.h" +#include "tdesip.h" #include "sipint.h" diff --git a/siplib/tqtlib.c b/siplib/tqtlib.c index 9bf065a..810c660 100644 --- a/siplib/tqtlib.c +++ b/siplib/tqtlib.c @@ -22,7 +22,7 @@ #include #include -#include "sip.h" +#include "tdesip.h" #include "sipint.h" diff --git a/siplib/voidptr.c b/siplib/voidptr.c index fc26046..6d4452e 100644 --- a/siplib/voidptr.c +++ b/siplib/voidptr.c @@ -21,7 +21,7 @@ #include -#include "sip.h" +#include "tdesip.h" #include "sipint.h" diff --git a/specs/freebsd-clang b/specs/freebsd-clang new file mode 100644 index 0000000..a3a2da4 --- /dev/null +++ b/specs/freebsd-clang @@ -0,0 +1,81 @@ +# +# +# qmake configuration for freebsd-clang +# + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt warn_on release thread link_prl + +QMAKE_CC = clang +QMAKE_LEX = flex +QMAKE_LEXFLAGS = +QMAKE_YACC = yacc +QMAKE_YACCFLAGS = -d +QMAKE_CFLAGS = -pipe -fvisibility=hidden +QMAKE_CFLAGS_DEPS = -M +QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_OFF = -w +QMAKE_CFLAGS_RELEASE = -O2 +QMAKE_CFLAGS_DEBUG = -g +QMAKE_CFLAGS_SHLIB = -fPIC +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +QMAKE_CXX = clang++ +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fvisibility-inlines-hidden +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +# Addon software goes into /usr/local on the BSDs, by default we will look there +QMAKE_INCDIR = /usr/local/include +QMAKE_LIBDIR = /usr/local/lib +QMAKE_INCDIR_X11 = /usr/X11R6/include +QMAKE_LIBDIR_X11 = /usr/X11R6/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib +QMAKE_INCDIR_OPENGL = /usr/X11R6/include +QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib + +QMAKE_LINK = clang++ +QMAKE_LINK_SHLIB = clang++ +QMAKE_LFLAGS = +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_SHLIB = -shared +QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_SONAME = -Wl,-soname, +QMAKE_LFLAGS_THREAD = -pthread +QMAKE_RPATH = -Wl,-rpath, + +QMAKE_LIBS = +QMAKE_LIBS_DYNLOAD = +QMAKE_LIBS_X11 = -lXext -lX11 -lm +QMAKE_LIBS_X11SM = -lSM -lICE +QMAKE_LIBS_QT = -lqt +QMAKE_LIBS_QT_THREAD = -ltqt-mt +QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu +QMAKE_LIBS_OPENGL_QT = -lGL -lXmu +QMAKE_LIBS_THREAD = + +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic + +QMAKE_AR = ar cqs +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p