- In x11-toolkits/irrlicht build only the shared library. The upstream
Makefile does not support building both the static and shared library. It compiles the code without -fPIC first for the static library and then creates the shared library from the same object files without recompiling them with -fPIC. - The upstream install target can now be used as well. - Use upstream library version and bump dependent ports.
This commit is contained in:
Tijl Coosemans
parent
7f41bc060e
commit
2f49d6ba56
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=434192
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= freeminer
|
||||
PORTVERSION= 0.4.10.4
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= games
|
||||
|
||||
MAINTAINER= amdmi3@FreeBSD.org
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= irrlamb
|
||||
PORTVERSION= 0.2.1
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= games
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
PORTNAME= minetest
|
||||
PORTVERSION= 0.4.15
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= games
|
||||
|
||||
MAINTAINER= amdmi3@FreeBSD.org
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
PORTNAME= voxelands
|
||||
PORTVERSION= 1604.00
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= games
|
||||
MASTER_SITES= http://voxelands.com/downloads/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= cegui
|
||||
PORTVERSION= 0.8.4
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= graphics devel
|
||||
MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.8
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
PORTNAME= irrlicht
|
||||
PORTVERSION= 1.8.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-toolkits graphics
|
||||
MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/
|
||||
|
||||
@ -19,16 +20,13 @@ USES= alias dos2unix gmake jpeg zip
|
||||
USE_GL= gl
|
||||
USE_XORG= x11 xxf86vm
|
||||
USE_LDCONFIG= yes
|
||||
MAKE_ENV= SHLIB_VER=${SHARED_LIB_VER}
|
||||
|
||||
CFLAGS_aarch64= -fPIC
|
||||
CFLAGS_amd64= -fPIC
|
||||
|
||||
PLIST_SUB= SHARED_LIB_VER=${SHARED_LIB_VER}
|
||||
ALL_TARGET= sharedlib
|
||||
PLIST_SUB= PORTVERSION=${PORTVERSION} SOVERSION=${PORTVERSION:R}
|
||||
SUB_FILES= pkg-message
|
||||
BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht
|
||||
INSTALL_WRKSRC= ${BUILD_WRKSRC}
|
||||
|
||||
SHARED_LIB_VER= 1
|
||||
EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement \
|
||||
05.UserInterface 06.2DGraphics 07.Collision 08.SpecialFX \
|
||||
09.Meshviewer 10.Shaders 11.PerPixelLighting \
|
||||
@ -38,8 +36,6 @@ OPTIONS_DEFINE= DEBUG EXAMPLES
|
||||
|
||||
DEBUG_MAKE_ENV_OFF= NDEBUG=1
|
||||
|
||||
BROKEN_sparc64= Does not compile
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \
|
||||
-e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \
|
||||
@ -48,18 +44,7 @@ post-patch:
|
||||
-e '/#define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \
|
||||
${WRKSRC}/include/IrrCompileConfig.h
|
||||
|
||||
do-install:
|
||||
@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
|
||||
${INSTALL_DATA} ${WRKSRC}/include/*.h \
|
||||
${STAGEDIR}${PREFIX}/include/${PORTNAME}
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a \
|
||||
${STAGEDIR}${PREFIX}/lib
|
||||
${INSTALL_LIB} ${WRKSRC}/lib/FreeBSD/libIrrlicht.so.${SHARED_LIB_VER} \
|
||||
${STAGEDIR}${PREFIX}/lib
|
||||
${LN} -sf libIrrlicht.so.${SHARED_LIB_VER} \
|
||||
${STAGEDIR}${PREFIX}/lib/libIrrlicht.so
|
||||
|
||||
do-install-EXAMPLES-on:
|
||||
post-install-EXAMPLES-on:
|
||||
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${EXAMPLEDIRS}" \
|
||||
${STAGEDIR}${EXAMPLESDIR} \
|
||||
"( -name Makefile -or -name *\.cpp -or -name *\.h )"
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
STATIC_LIB = libIrrlicht.a
|
||||
LIB_PATH = ../../lib/$(SYSTEM)
|
||||
-INSTALL_DIR = /usr/local/lib
|
||||
+INSTALL_DIR = ${PREFIX}/lib
|
||||
+INSTALL_DIR = ${DESTDIR}${PREFIX}/lib
|
||||
sharedlib install: SHARED_LIB = libIrrlicht.so
|
||||
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
|
||||
-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
|
||||
@ -44,20 +44,3 @@
|
||||
|
||||
#OSX specific options
|
||||
staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
|
||||
@@ -117,13 +114,13 @@
|
||||
|
||||
####################
|
||||
# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
|
||||
-all linux: staticlib
|
||||
+all linux: staticlib sharedlib
|
||||
|
||||
# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
|
||||
sharedlib: $(LINKOBJ)
|
||||
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS)
|
||||
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(SHLIB_VER) -o $(SHARED_LIB).$(SHLIB_VER) $^ $(LDFLAGS)
|
||||
mkdir -p $(LIB_PATH)
|
||||
- cp $(SHARED_FULLNAME) $(LIB_PATH)
|
||||
+ cp $(SHARED_LIB).$(SHLIB_VER) $(LIB_PATH)
|
||||
|
||||
# Builds Irrlicht as static lib (libIrrlicht.a)
|
||||
$(STATIC_LIB): $(LINKOBJ)
|
||||
|
||||
@ -180,9 +180,9 @@ include/irrlicht/rect.h
|
||||
include/irrlicht/triangle3d.h
|
||||
include/irrlicht/vector2d.h
|
||||
include/irrlicht/vector3d.h
|
||||
lib/libIrrlicht.a
|
||||
lib/libIrrlicht.so
|
||||
lib/libIrrlicht.so.%%SHARED_LIB_VER%%
|
||||
lib/libIrrlicht.so.%%SOVERSION%%
|
||||
lib/libIrrlicht.so.%%PORTVERSION%%
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/01.HelloWorld/Makefile
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/01.HelloWorld/main.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/02.Quake3Map/Makefile
|
||||
|
||||
Loading…
Reference in New Issue
Block a user