fltk14-devel: Updated patches
Merge patches for configure script into patch for configure.ac. Add patch to remove hardcoded paths (fail if not $PREFIX by coincidence).
This commit is contained in:
Michael Baeuerle
parent
511986ee7b
commit
5aec68cf73
|
|
@ -5,9 +5,9 @@ RMD160 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 38badf8fe2380
|
|||
SHA512 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 900f828e442135e6f9d87b1eea269c9995054bb67b384f2ec477ed7cefece1572967011461b11016b246d0d9d5a97456f1c3a9a1beede9084cc76af884e078b7
|
||||
Size (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 6645355 bytes
|
||||
SHA1 (patch-Makefile) = 7db024b114282797a0b1b20df70f73a487fec0e2
|
||||
SHA1 (patch-configure) = 7c0f973352802dedbc38564b18950c10d1829d12
|
||||
SHA1 (patch-configure.ac) = 7c34af898d3c4b8e9f6715854568febaeb696ccc
|
||||
SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
|
||||
SHA1 (patch-fluid_Makefile) = 8a727140bbcea9ca3bd8ce16ec3cb9b37cef3bb4
|
||||
SHA1 (patch-makeinclude.in) = b79a32c2d7571f79078f8ec6036a0e41604f6fac
|
||||
SHA1 (patch-src_Makefile) = c36f590280da5604ebf949142074db02d0cc327e
|
||||
SHA1 (patch-src_Makefile) = 33923c156f8cb589868578217c96c035847aa9d5
|
||||
SHA1 (patch-test_Makefile) = 4d1ca36ee11edc923c0b2168c4cf83fb4985d368
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
Modify configure script for "--enable-libtool".
|
||||
|
||||
--- configure.orig 2016-11-11 16:04:30.000000000 +0000
|
||||
+++ configure
|
||||
@@ -3841,7 +3841,22 @@ if test "${enable_shared+set}" = set; th
|
||||
enableval=$enable_shared;
|
||||
fi
|
||||
|
||||
-if test x$enable_shared = xyes; then
|
||||
+
|
||||
+# Check whether --enable-libtool or --disable-libtool was given.
|
||||
+if test "${enable_libtool+set}" = set; then
|
||||
+ enableval="$enable_libtool"
|
||||
+
|
||||
+if test x$enable_libtool != xno; then
|
||||
+ LIBTOOL="$enable_libtool"
|
||||
+ enable_shared=no
|
||||
+else
|
||||
+ LIBTOOL=""
|
||||
+fi
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+if test "$enable_shared" = "yes"; then
|
||||
+
|
||||
PICFLAG=1
|
||||
SHAREDSUFFIX=""
|
||||
FLUID="fluid-shared"
|
||||
@@ -4076,6 +4091,20 @@ else
|
||||
LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
|
||||
fi
|
||||
|
||||
+if test "x$LIBTOOL" != "x"; then
|
||||
+ LINKFLTK="../src/libfltk.la"
|
||||
+ if test "x$LINKFLTKGL" != "x"; then
|
||||
+ LINKFLTKGL="../src/libfltk_gl.la"
|
||||
+ fi
|
||||
+ if test "x$LINKFLTKIMG" != "x"; then
|
||||
+ LINKFLTKIMG="../src/libfltk_images.la"
|
||||
+ fi
|
||||
+ LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
|
||||
+ DSONAME="libfltk.la"
|
||||
+ FLDSONAME="libfltk_forms.la"
|
||||
+ GLDSONAME="libfltk_gl.la"
|
||||
+ IMGDSONAME="libfltk_images.la"
|
||||
+fi
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
$NetBSD$
|
||||
|
||||
Modifications for "--enable-libtool".
|
||||
|
||||
Remove OS specific CXXFLAGS and PANGOLIBDIR selection
|
||||
(tested to fail on GNU/Linux).
|
||||
|
||||
--- configure.ac.orig 2019-04-07 09:24:20.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -217,7 +217,20 @@ fi
|
||||
AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [[default=yes]]])
|
||||
|
||||
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [[default=no]]])
|
||||
-if test x$enable_shared = xyes; then
|
||||
+
|
||||
+# Check whether --enable-libtool or --disable-libtool was given.
|
||||
+if test "${enable_libtool+set}" = set; then
|
||||
+ enableval="$enable_libtool"
|
||||
+
|
||||
+if test x$enable_libtool != xno; then
|
||||
+ LIBTOOL="$enable_libtool"
|
||||
+ enable_shared=no
|
||||
+else
|
||||
+ LIBTOOL=""
|
||||
+fi
|
||||
+fi
|
||||
+
|
||||
+if test "$enable_shared" = "yes"; then
|
||||
PICFLAG=1
|
||||
SHAREDSUFFIX=""
|
||||
FLUID="fluid-shared"
|
||||
@@ -390,6 +403,21 @@ else
|
||||
LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
|
||||
fi
|
||||
|
||||
+if test "x$LIBTOOL" != "x"; then
|
||||
+ LINKFLTK="../src/libfltk.la"
|
||||
+ if test "x$LINKFLTKGL" != "x"; then
|
||||
+ LINKFLTKGL="../src/libfltk_gl.la"
|
||||
+ fi
|
||||
+ if test "x$LINKFLTKIMG" != "x"; then
|
||||
+ LINKFLTKIMG="../src/libfltk_images.la"
|
||||
+ fi
|
||||
+ LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
|
||||
+ DSONAME="libfltk.la"
|
||||
+ FLDSONAME="libfltk_forms.la"
|
||||
+ GLDSONAME="libfltk_gl.la"
|
||||
+ IMGDSONAME="libfltk_images.la"
|
||||
+fi
|
||||
+
|
||||
AC_SUBST(DSOCOMMAND)
|
||||
AC_SUBST(DSOFLAGS)
|
||||
AC_SUBST(DSOLINK)
|
||||
@@ -1087,25 +1115,27 @@ case $host_os_gui in
|
||||
|
||||
pango_found=no
|
||||
if test x$enable_pango = xyes; then
|
||||
- case $host_os in
|
||||
- darwin*)
|
||||
- CXXFLAGS="-I/sw/include/pango-1.0 -I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include $CXXFLAGS"
|
||||
- PANGOLIBDIR="-L/sw/lib"
|
||||
- ;;
|
||||
- linux*)
|
||||
- CXXFLAGS="-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $CXXFLAGS"
|
||||
- CXXFLAGS="-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include $CXXFLAGS"
|
||||
- ;;
|
||||
- freebsd*)
|
||||
- CXXFLAGS="-I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include $CXXFLAGS"
|
||||
- ;;
|
||||
- netbsd*)
|
||||
- CXXFLAGS="-I/usr/pkg/include/pango-1.0 -I/usr/pkg/include/glib-2.0 -I/usr/pkg/lib/glib-2.0/include $CXXFLAGS"
|
||||
- CXXFLAGS="-I/usr/pkg/include/glib/glib-2.0 $CXXFLAGS"
|
||||
- PANGOLIBDIR="-L/usr/pkg/lib"
|
||||
- LDFLAGS="-Wl,-rpath,/usr/pkg/lib $LDFLAGS"
|
||||
- ;;
|
||||
- esac
|
||||
+ dnl # Remove OS specific CXXFLAGS and PANGOLIBDIR selection for pkgsrc
|
||||
+ dnl # Use ${prefix} instead of hard coded locations
|
||||
+ dnl case $host_os in
|
||||
+ dnl darwin*)
|
||||
+ dnl CXXFLAGS="-I/sw/include/pango-1.0 -I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include $CXXFLAGS"
|
||||
+ dnl PANGOLIBDIR="-L/sw/lib"
|
||||
+ dnl ;;
|
||||
+ dnl linux*)
|
||||
+ dnl CXXFLAGS="-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $CXXFLAGS"
|
||||
+ dnl CXXFLAGS="-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include $CXXFLAGS"
|
||||
+ dnl ;;
|
||||
+ dnl freebsd*)
|
||||
+ dnl CXXFLAGS="-I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include $CXXFLAGS"
|
||||
+ dnl ;;
|
||||
+ dnl netbsd*)
|
||||
+ CXXFLAGS="-I$prefix/include/pango-1.0 -I$prefix/include/glib-2.0 -I$prefix/lib/glib-2.0/include $CXXFLAGS"
|
||||
+ CXXFLAGS="-I$prefix/include/glib/glib-2.0 $CXXFLAGS"
|
||||
+ PANGOLIBDIR="-L$prefix/lib"
|
||||
+ LDFLAGS="-Wl,-rpath,$prefix/lib $LDFLAGS"
|
||||
+ dnl ;;
|
||||
+ dnl esac
|
||||
CPPFLAGS="$PANGOLIBDIR $CXXFLAGS"
|
||||
AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h],
|
||||
AC_CHECK_LIB(pango-1.0, pango_layout_new,
|
||||
|
|
@ -2,7 +2,7 @@ $NetBSD$
|
|||
|
||||
Use libtool to link and install binaries.
|
||||
|
||||
--- src/Makefile.orig 2018-04-30 08:36:52.000000000 +0000
|
||||
--- src/Makefile.orig 2019-04-07 09:24:20.000000000 +0000
|
||||
+++ src/Makefile
|
||||
@@ -353,6 +353,10 @@ $(LIBNAME): $(OBJECTS)
|
||||
$(LIBCOMMAND) $@ $(OBJECTS)
|
||||
|
|
@ -48,7 +48,7 @@ Use libtool to link and install binaries.
|
|||
libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
|
||||
@@ -687,6 +703,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
@@ -749,6 +765,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
|
||||
$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
|
||||
fi
|
||||
|
|
@ -58,7 +58,7 @@ Use libtool to link and install binaries.
|
|||
$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
|
||||
if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
|
||||
@@ -707,6 +726,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
@@ -769,6 +788,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
|
||||
$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
|
||||
fi
|
||||
|
|
@ -68,7 +68,7 @@ Use libtool to link and install binaries.
|
|||
if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
|
||||
$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
|
||||
$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
|
||||
@@ -724,6 +746,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
@@ -786,6 +808,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
$(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
|
||||
$(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
|
||||
fi
|
||||
|
|
@ -78,7 +78,7 @@ Use libtool to link and install binaries.
|
|||
if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
|
||||
$(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
|
||||
@@ -781,6 +806,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
@@ -843,6 +868,9 @@ install: $(LIBNAME) $(DSONAME) \
|
||||
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
|
||||
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue