Witam,
pierwszy patch ustawia ścieżkę do headerów gtk2. Wcześniej nie było z tym
problemów, ale po ostatnim upgrejdzie coś się widać zmieniło.
A po drugiej poprawce zaczyna działać demo - Simulation - n-pendulum,
kompilujące własną bibliotekę .so ze źródeł w fortranie.
Wydaje mi się, że nie ma potrzeby dodawać R: gcc-g77 do speca.
Do normalnej pracy i tak nie jest potrzebny, a jak ktoś się będzie
się tym bawił to go sobie zainstaluje.
Chyba, że macie inne pomysły?
Jeżeli jest wszystko w porządku, to proszę o dodanie do CVSu.
Pozdrawiam,
--
Maciej Witaszek <[EMAIL PROTECTED]>
--- routines/gzvt2/Makefile.in.orig 2004-10-05 20:45:17.000000000 +0000
+++ routines/gzvt2/Makefile.in 2005-12-27 19:38:01.000000000 +0000
@@ -10,6 +10,7 @@
[EMAIL PROTECTED]@
LDFLAGS=$(@TERM_LDFLAGS@)
+CFLAGS=$(CC_OPTIONS)
all :: ../../bin/zterm
@@ -17,7 +18,7 @@
@$(RM) -f zterm gtkplug
../../bin/zterm : $(TERM_NAME).c
- $(CC) -o ../../bin/zterm $(TERM_NAME).c $(LDFLAGS)
+ $(CC) $(CFLAGS) -o ../../bin/zterm $(TERM_NAME).c $(LDFLAGS)
distclean::
$(RM) -f ../../bin/zterm gtkplug
--- config/Makeso.incl.in.orig 2005-12-28 14:36:12.000000000 +0100
+++ config/Makeso.incl.in 2005-12-28 14:36:25.000000000 +0100
@@ -37,7 +37,7 @@
CXXLTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(CXX) $(INCLUDES) $(CXXFLAGS) $(CFLAGS)
FLTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(FC) $(INCLUDES) $(FFLAGS)
-LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) $(OTHERLIBS) -o $@
+LINK = $(LIBTOOL) --mode=link --tag=CXX $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) $(OTHERLIBS) -o $@
OBJECTS = $(OBJS:.o=.lo)
LIBRARY_NAME = $(LIBRARY:.a=)
Index: scilab.spec
===================================================================
RCS file: /cvsroot/SPECS/scilab.spec,v
retrieving revision 1.55
diff -u -r1.55 scilab.spec
--- scilab.spec 30 Nov 2005 00:25:23 -0000 1.55
+++ scilab.spec 28 Dec 2005 14:43:18 -0000
@@ -27,6 +27,8 @@
Patch4: %{name}-typo.patch
Patch5: %{name}-lib64.patch
Patch6: %{name}-docbasedir.patch
+Patch7: %{name}-cflags.patch
+Patch8: %{name}-libtool.patch
URL: http://www.scilab.org/
BuildRequires: XFree86-devel
BuildRequires: Xaw3d-devel
@@ -85,6 +87,8 @@
%patch5 -p1
%endif
%patch6 -p1
+%patch7 -p0
+%patch8 -p0
head -n 438 aclocal.m4 > acinclude.m4
tail -n 68 aclocal.m4 >>acinclude.m4
@@ -117,6 +121,7 @@
install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}-%{version}} \
$RPM_BUILD_ROOT{%{_examplesdir}/scilab,%{_appdefsdir}} \
$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/config \
$RPM_BUILD_ROOT%{_desktopdir} \
$RPM_BUILD_ROOT%{_pixmapsdir}
@@ -132,6 +137,10 @@
mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{X11_defaults,contrib,demos,macros,man,maple,routines,tcl,.binary,scilab*} \
$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+install config/Makeso.incl $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/config
+install libtool $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}
+install Makefile.incl $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}
+
ln -fs %{_datadir}/%{name}-%{version}/contrib $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/contrib
ln -fs %{_datadir}/%{name}-%{version}/demos $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/demos
ln -fs %{_datadir}/%{name}-%{version}/macros $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/macros
@@ -219,6 +228,10 @@
%{_libdir}/%{name}-%{version}/util
%{_desktopdir}/*
%{_pixmapsdir}/%{name}.png
+%dir %{_libdir}/%{name}-%{version}/config
+%{_libdir}/%{name}-%{version}/config/Makeso.incl
+%{_libdir}/%{name}-%{version}/Makefile.incl
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/libtool
%files doc
%defattr(644,root,root,755)
@@ -231,7 +244,6 @@
%{_libdir}/%{name}-%{version}/tests/*.ref
%{_libdir}/%{name}-%{version}/tests/*.tst
%attr(755,root,root) %{_libdir}/%{name}-%{version}/tests/*.sh
-#%%{_libdir}/%{name}-%{version}/config
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
