diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-06-16 01:25:25 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-06-16 01:25:25 +0000 |
| commit | dd78661ebaf2cba329628b7e607c9c97fa9fe2e9 (patch) | |
| tree | 93f755d023b48fc7e5e3190a08f74d65ccdcd21d | |
| parent | 86c9849e617363a934e83cce9466797404bbbf16 (diff) | |
| download | ports-dd78661ebaf2cba329628b7e607c9c97fa9fe2e9.tar.gz ports-dd78661ebaf2cba329628b7e607c9c97fa9fe2e9.zip | |
MFH: r389216
- Disable precompiled headers to fix build with old gcc on -current kernel
- Comment out unused directory
Approved by: portmgr blanket
Approved by: ports-secteam (build fix blanket)
Notes
Notes:
svn path=/branches/2015Q2/; revision=389808
| -rw-r--r-- | cad/leocad/Makefile | 2 | ||||
| -rw-r--r-- | cad/leocad/files/patch-leocad.pro | 12 | ||||
| -rw-r--r-- | cad/leocad/pkg-plist | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index a5282b805069..b84a443ef599 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -26,6 +26,8 @@ USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ USE_GL= glut USE_GNOME= gtk20 +CXXFLAGS+= -include ${WRKSRC}/common/lc_global.h + PORTDOCS= CREDITS.txt README.txt OPTIONS_DEFINE= DOCS diff --git a/cad/leocad/files/patch-leocad.pro b/cad/leocad/files/patch-leocad.pro new file mode 100644 index 000000000000..a4b071b14568 --- /dev/null +++ b/cad/leocad/files/patch-leocad.pro @@ -0,0 +1,12 @@ +--- leocad.pro.orig 2014-01-30 23:26:55 UTC ++++ leocad.pro +@@ -7,8 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4) { + } + + INCLUDEPATH += qt common +-CONFIG += precompile_header incremental +-PRECOMPILED_HEADER = common/lc_global.h ++CONFIG += incremental + win32 { + QMAKE_CXXFLAGS_WARN_ON += -wd4100 + DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1 diff --git a/cad/leocad/pkg-plist b/cad/leocad/pkg-plist index e5e0d60de6fd..3903aab8aa60 100644 --- a/cad/leocad/pkg-plist +++ b/cad/leocad/pkg-plist @@ -20,3 +20,4 @@ share/icons/hicolor/scalable/mimetypes/application-vnd.leocad.svg %%DATADIR%%/library.bin share/mime/packages/leocad.xml share/pixmaps/leocad.png +@comment @dir share/icons/hicolor/scalable/apps |