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

move libjvmaccesslo.so and libjvmfwklo.so to -main and build

Browse Source 
stub libraries if no_java is being used so that the plist
can pick them up in -main
This commit is contained in:
robert 2013-12-07 19:42:40 +00:00
parent f950f63b65
commit 8b795f1e6f
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.99 2013/12/03 10:15:17 sthen Exp $
# $OpenBSD: Makefile,v 1.100 2013/12/07 19:42:40 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
BROKEN-i386= undefined symbol _ZN5boost6system15system_categoryEv in libscfiltlo.so (CppunitTest_sc_filters_test)
@ -18,8 +18,8 @@ PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde3
REVISION-main= 0
REVISION-java= 0
REVISION-main= 1
REVISION-java= 1
EPOCH= 0
@ -379,4 +379,17 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/workdir/unxobsd.pro/CustomTarget/sysui/share/libreoffice/openoffice.org.xml \
${PREFIX}/share/mime/packages
# If the -java package does not get build use stub libraries for
# libjvmaccesslo.so and libjvmfwklo.so so that they can get included
# in the -main package because they are needed even if the -java
# subpackage is not installed.
.if !${BUILD_PACKAGES:M-java}
echo "int main(void) { return 0; }" > ${WRKSRC}/stub.c
${CC} -shared -o ${WRKBUILD}/stub.o ${WRKSRC}/stub.c
. for i in jvmaccess jvmfwk
${INSTALL_PROGRAM} ${WRKBUILD}/stub.o \
${PREFIX}/lib/libreoffice/ure/lib/lib${i}lo.so
. endfor
.endif
.include <bsd.port.mk>

4
editors/libreoffice/pkg/PFRAG.shared-java
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared-java,v 1.7 2013/11/17 11:45:52 robert Exp $
@comment $OpenBSD: PFRAG.shared-java,v 1.8 2013/12/07 19:42:40 robert Exp $
lib/libreoffice/program/libhsqldb.so
lib/libreoffice/program/libjdbclo.so
lib/libreoffice/program/libofficebean.so
@ -8,6 +8,4 @@ lib/libreoffice/ure/lib/libjavavmlo.so
lib/libreoffice/ure/lib/libjpipe.so
lib/libreoffice/ure/lib/libjuh.so
lib/libreoffice/ure/lib/libjuhx.so
lib/libreoffice/ure/lib/libjvmaccesslo.so
lib/libreoffice/ure/lib/libjvmfwklo.so
lib/libreoffice/ure/lib/libsunjavapluginlo.so

4
editors/libreoffice/pkg/PFRAG.shared-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.12 2013/11/17 11:45:52 robert Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.13 2013/12/07 19:42:40 robert Exp $
lib/libreoffice/program/libPresenterScreenlo.so
lib/libreoffice/program/libabplo.so
lib/libreoffice/program/libacclo.so
@ -244,6 +244,8 @@ lib/libreoffice/ure/lib/libgcc3_uno.so
lib/libreoffice/ure/lib/libintrospectionlo.so
lib/libreoffice/ure/lib/libinvocadaptlo.so
lib/libreoffice/ure/lib/libinvocationlo.so
lib/libreoffice/ure/lib/libjvmaccesslo.so
lib/libreoffice/ure/lib/libjvmfwklo.so
lib/libreoffice/ure/lib/liblog_uno_uno.so
lib/libreoffice/ure/lib/libnamingservicelo.so
lib/libreoffice/ure/lib/libproxyfaclo.so