cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unfuck fuck-up so that it packages with fucking g++4

Browse Source
This commit is contained in:
espie 2010-04-24 22:36:49 +00:00
parent 0c8cf44b29
commit 78b2ae4ccd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.65 2010/04/19 09:36:30 espie Exp $ # $OpenBSD: Makefile,v 1.66 2010/04/24 22:36:49 espie Exp $
COMMENT-debug = C++ GUI toolkit, debug COMMENT-debug = C++ GUI toolkit, debug
COMMENT-main = C++ X11 GUI toolkit COMMENT-main = C++ X11 GUI toolkit
@ -239,7 +239,7 @@ MODULES =
PKG_ARGS += -DGCC4=1 PKG_ARGS += -DGCC4=1
LIB_DEPENDS-examples += QtWebKit,QtXmlPatterns::${BASE_PKGPATH} LIB_DEPENDS-examples += QtWebKit,QtXmlPatterns::${BASE_PKGPATH}
WANTLIB-examples += sqlite3 WANTLIB-examples += sqlite3
WANTLIB-main += sqlite3 LIB_DEPENDS-main += sqlite3::databases/sqlite3
.else .else
PKG_ARGS += -DGCC4=0 PKG_ARGS += -DGCC4=0
commonWANTLIB += stdc++ commonWANTLIB += stdc++
@ -295,7 +295,8 @@ post-install:
# this helps qdbuscpp2xml # this helps qdbuscpp2xml
cd ${QT_BINDIR} && ln -sf moc moc4 cd ${QT_BINDIR} && ln -sf moc moc4
.for l v in ${SHARED_LIBS} .for l v in ${SHARED_LIBS}
ln -sf qt4/lib$l.so.$v ${PREFIX}/lib test -f ${PREFIX}/lib/qt4/lib$l.so.$v && \
ln -sf qt4/lib$l.so.$v ${PREFIX}/lib
.endfor .endfor
# cleanup # cleanup
cd ${PREFIX}/lib/qt4 && ln -sf ../../include/X11/qt4 include cd ${PREFIX}/lib/qt4 && ln -sf ../../include/X11/qt4 include

5
x11/qt4/pkg/PFRAG.GCC4-shared-main
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.GCC4-shared-main,v 1.2 2010/04/19 09:36:30 espie Exp $ @comment $OpenBSD: PFRAG.GCC4-shared-main,v 1.3 2010/04/24 22:36:49 espie Exp $
lib/libQtWebKit.so.1.0 @lib lib/libQtWebKit.so.${LIBQtWebKit_VERSION}
@lib lib/qt4/libQtWebKit.so.${LIBQtWebKit_VERSION}