summaryrefslogtreecommitdiff
path: root/sci-electronics/klayout/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-23 04:19:44 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-23 04:19:44 +0000
commitc5283d322accc6097afec74eab24550829788bab (patch)
treeb99ce668128d82a026eaa31461643f9173f9b77b /sci-electronics/klayout/files
parent5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff)
gentoo resync : 23.03.2018
Diffstat (limited to 'sci-electronics/klayout/files')
-rw-r--r--sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo45
-rw-r--r--sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch34
2 files changed, 0 insertions, 79 deletions
diff --git a/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo b/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo
deleted file mode 100644
index d51b60a31db9..000000000000
--- a/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# Configuration file for
-# gcc, Linux, 64bit
-# release build
-
-# Compiler options
-
-# Compiler general
-INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
-DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII
-
-# C++
-CXXOPT_DEP=-MM -MG
-CXXWARN=-Wall -pedantic -Wno-deprecated -Woverloaded-virtual \
- -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing
-CXXOPT=-c $(CXXFLAGS) -o
-CXXOPT_SO=-fPIC $(CXXOPT)
-
-# C
-CCOPT_DEP=-MM -MG
-CCWARN=
-CCOPT=-c $(CFLAGS) -o
-CCOPT_SO=-fPIC $(CCOPT)
-
-# Linker
-LINK=$(CXX)
-LOPT=-Wl,-E ${LDFLAGS} -o
-LOPT_SO=-shared -fPIC $(LOPT)
-
-LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lstdc++ -lcrypt -ldl -lz -lpthread
-
-.PHONY: install
-install:
- mkdir -p $(INSTALL_BINDIR)
- cp main/$(EXEC_NAME) $(INSTALL_BINDIR)
- for bin in $(OTHER_BIN) ; \
- do \
- cp main/$$bin $(INSTALL_BINDIR) ; \
- done
- for plugin in $(PLUGINS) ; \
- do \
- cp $$plugin/*.so $(INSTALL_BINDIR) ; \
- done
- chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/*
-
diff --git a/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch b/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch
deleted file mode 100644
index 4cb6473d58c5..000000000000
--- a/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Fixes "error: throw will always call terminate() [-Werror=terminate]". Gentoo bug 612978.
-
---- a/src/tlAssert.h.old
-+++ b/src/tlAssert.h
-@@ -27,6 +27,16 @@
-
- #include "config.h"
-
-+// For >=C++11, mark assertion_failed() with attribute [[noreturn]] and call std::terminate().
-+// Or else, throw int(0) to tell the compiler that the assertion will not return.
-+#if __cplusplus < 201103L
-+#define ATTRIB_ASSERT KLAYOUT_DLL
-+#define END_ASSERT throw int(0)
-+#else
-+#define ATTRIB_ASSERT [[noreturn]] KLAYOUT_DLL
-+#define END_ASSERT std::terminate()
-+#endif
-+
- namespace tl
- {
-
-@@ -34,10 +44,10 @@
- * @brief The corresponding assert macro
- */
-
--KLAYOUT_DLL void assertion_failed (const char *filename, unsigned int line, const char *condition);
-+ATTRIB_ASSERT void assertion_failed (const char *filename, unsigned int line, const char *condition);
-
- // the throw int(0) instruction will tell the compiler that the assertion will not return
--#define tl_assert(COND) if (!(COND)) { tl::assertion_failed (__FILE__, __LINE__, #COND); throw int(0); }
-+#define tl_assert(COND) if (!(COND)) { tl::assertion_failed (__FILE__, __LINE__, #COND); END_ASSERT; }
-
- } // namespace tl
-