diff options
| -rw-r--r-- | recipes/fltk/files/fix-it-damnit.patch | 39 | ||||
| -rw-r--r-- | recipes/fltk/fltk2_svn.bb | 55 |
2 files changed, 70 insertions, 24 deletions
diff --git a/recipes/fltk/files/fix-it-damnit.patch b/recipes/fltk/files/fix-it-damnit.patch new file mode 100644 index 0000000000..ed1effdfc7 --- /dev/null +++ b/recipes/fltk/files/fix-it-damnit.patch @@ -0,0 +1,39 @@ +Index: fltk-2.0.x-r6671/Makefile +=================================================================== +--- fltk-2.0.x-r6671.orig/Makefile ++++ fltk-2.0.x-r6671/Makefile +@@ -25,7 +25,7 @@ + + include makeinclude + +-DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test ++DIRS = src $(LOCALIMAGES) images fluid + + all: makeinclude + for dir in $(DIRS); do\ +Index: fltk-2.0.x-r6671/makeinclude.in +=================================================================== +--- fltk-2.0.x-r6671.orig/makeinclude.in ++++ fltk-2.0.x-r6671/makeinclude.in +@@ -79,7 +79,7 @@ + # libraries to link with: + LDLIBS = @LDFLAGS@ @LIBS@ + GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ +-LINKFLTK = -L../lib @LINKFLTK@ ++LINKFLTK = -L../lib @LINKFLTK@ + LINKFLTKGL = -L../lib @LINKFLTKGL@ @LINKFLTK@ + LINKFLTKFORMS = -L../lib -lfltk2_forms @LINKFLTK@ + LOCAL_IMAGELIBS = @LOCAL_IMAGELIBS@ +Index: fltk-2.0.x-r6671/src/Makefile +=================================================================== +--- fltk-2.0.x-r6671.orig/src/Makefile ++++ fltk-2.0.x-r6671/src/Makefile +@@ -235,7 +235,7 @@ + + ../lib/$(DSONAME): $(OBJECTS) + echo $(DSOCOMMAND) $@ $(OBJECTS) -L../lib $(IMAGELIBS) +- $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) ++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) -Wl,-soname,$(DSONAME) + $(RM) ../lib/$(DSOLINK) + $(LN) ../lib/$(DSONAME) ../lib/$(DSOLINK) + diff --git a/recipes/fltk/fltk2_svn.bb b/recipes/fltk/fltk2_svn.bb index 31b1f6f054..0dddfa3e2f 100644 --- a/recipes/fltk/fltk2_svn.bb +++ b/recipes/fltk/fltk2_svn.bb @@ -5,41 +5,48 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "zlib jpeg libpng libxext libxft" -SRC_URI = "http://ftp.easysw.com/pub/fltk/snapshots/fltk-2.0.x-r6671.tar.bz2" +SVNREL = "6671" +PV = "1.9.9+svnr${SVNREL}" -#S = "${WORKDIR}/fltk-${PV}" +SRC_URI = "\ + http://ftp.easysw.com/pub/fltk/snapshots/fltk-2.0.x-r6671.tar.bz2 \ + file://fix-it-damnit.patch;patch=1 \ +" S = "${WORKDIR}/fltk-2.0.x-r6671" -inherit autotools binconfig +inherit autotools_stage binconfig -EXTRA_OECONF = "--enable-shared --enable-xdbe --enable-xft --enable-gl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}" +EXTRA_OECONF = "\ + --enable-shared \ + --enable-xdbe \ + --enable-xft \ + --disable-gl \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ +" do_configure() { - oe_runconf -} - -do_stage() { - autotools_stage_all + gnu-configize + oe_runconf } do_install () { sed -i "s|^STRIP.*=.*$|STRIP = ${STRIP}|" makeinclude sed -i "s|^bindir.*=.*$|bindir = ${D}${bindir}|" makeinclude - oe_runmake install \ + oe_runmake install \ prefix="${D}${prefix}" \ - bindir="${D}${bindir}" \ - libdir="${D}${libdir}" \ - includedir="${D}${includedir}" \ - datadir="${STAGING_DATADIR}" -} - -python populate_packages_prepend () { - if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libfltk2${PV}', d) + bindir="${D}${bindir}" \ + libdir="${D}${libdir}" \ + includedir="${D}${includedir}" \ + datadir="${STAGING_DATADIR}" + + # add missing links + ln -sf ./libfltk2.so.2.0 ${D}${libdir}/libfltk2.so.2 + ln -sf ./libfltk2_images.so.2.0 ${D}${libdir}/libfltk2_images.so.2 } -LEAD_SONAME = "libfltk2.so" - -FILES_${PN} += "${libdir}/libfltk2*.so.*" - -FILES_${PN}_dev += "/usr/bin/fluid"
\ No newline at end of file +PACKAGES =+ "${PN}-fluid ${PN}-images" +FILES_${PN}-fluid = "${bindir}/fluid2" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-images = "${libdir}/libfltk2_images*.so.*" +FILES_${PN}-dev += "${bindir}/fltk2-config" |