[packages/OGLFT] - fixed linking issues - rel 4
baggins
baggins at pld-linux.org
Sat Dec 7 10:58:50 CET 2013
commit 2d992a39e9bd032c4d43f164208b1c3e8dfbc249
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Dec 7 10:58:35 2013 +0100
- fixed linking issues
- rel 4
OGLFT.spec | 13 ++++++-------
link.patch | 18 ++++++++++++++++++
2 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/OGLFT.spec b/OGLFT.spec
index c366098..af9bae3 100644
--- a/OGLFT.spec
+++ b/OGLFT.spec
@@ -1,11 +1,12 @@
Summary: OpenGL-FreeType Library
Name: OGLFT
Version: 0.9
-Release: 3
+Release: 4
License: LGPL
Group: Libraries
Source0: http://downloads.sourceforge.net/oglft/oglft-%{version}.tar.gz
# Source0-md5: c3a8e0993f98edb7611c20f46631d2a6
+Patch0: link.patch
URL: http://oglft.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -39,19 +40,17 @@ Static version of OGLFT.
%prep
%setup -q -n oglft-%{version}
+%patch0 -p1
%build
QTDIR=/usr
CPPFLAGS=-I/usr/include/qt
export QTDIR CPPFLAGS
+%{__libtoolize}
%{__aclocal}
-# autoconf requires libtoolize, otherwise causes endless libtool loop
-#%%{__autoconf}
+%{__autoconf}
%{__autoheader}
-# automake requires aclocal and autoconf
-#%%{__automake}
-# libtoolize requires autoconf, otherwise ../libtool[400]: CDPATH: not found
-#%%{__libtoolize}
+%{__automake}
%configure
%{__make}
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..5e473ac
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,18 @@
+--- oglft-0.9/liboglft/Makefile.am~ 2003-10-01 12:53:35.000000000 +0200
++++ oglft-0.9/liboglft/Makefile.am 2013-12-07 10:48:05.469840970 +0100
+@@ -21,4 +21,5 @@
+ lib_LTLIBRARIES = libOGLFT.la
+ libOGLFT_la_SOURCES = OGLFT.cpp OGLFT.h
+ libOGLFT_la_LDFLAGS = -version-info 1:0:0
++libOGLFT_la_LIBADD = -lstdc++
+ INCLUDES = -I$(top_srcdir)/include
+--- oglft-0.9/configure.ac~ 2003-10-01 16:12:29.000000000 +0200
++++ oglft-0.9/configure.ac 2013-12-07 10:56:17.216504077 +0100
+@@ -107,7 +107,6 @@
+ qt_save_LDFLAGS=$LDFLAGS
+ qt_save_LIBS=$LIBS
+ CPPFLAGS="$CPPFLAGS -I${QTDIR}/include"
+- LDFLAGS="$LDFLAGS -L${QTDIR}/lib"
+
+ QTLIB=""
+ LIBS="$qt_save_LIBS -lqt"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OGLFT.git/commitdiff/2d992a39e9bd032c4d43f164208b1c3e8dfbc249
More information about the pld-cvs-commit
mailing list