Browse Source

add declarations missing from freebsd5, prevent build from picking up java

Michael van Elst 23 years ago
parent
commit
113aaa700d
2 changed files with 13 additions and 4 deletions
  1. 9 1
      mico/mico.patch
  2. 4 3
      mico/mico.spec

+ 9 - 1
mico/mico.patch

@@ -12,12 +12,20 @@ diff -Naur mico.orig/Makefile mico/Makefile
  	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
  	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
 --- mico.orig/include/mico/os-math.h	2003-06-13 16:07:15.000000000 +0200
 --- mico.orig/include/mico/os-math.h	2003-06-13 16:07:15.000000000 +0200
 +++ mico/include/mico/os-math.h	2003-06-13 16:07:16.000000000 +0200
 +++ mico/include/mico/os-math.h	2003-06-13 16:07:16.000000000 +0200
-@@ -280,10 +280,7 @@
+@@ -280,10 +280,15 @@
  #include <signal.h>
  #include <signal.h>
  #include <sys/types.h>
  #include <sys/types.h>
  
  
 -#if !defined(__GNUG__) || !defined(__sgi)
 -#if !defined(__GNUG__) || !defined(__sgi)
 -// conflict for initstate ()
 -// conflict for initstate ()
++extern "C" {
++#if defined(HAVE_ISINF)
++int isinf(double);
++#endif
++#if defined(HAVE_ISNAN)
++int isnan(double);
++#endif
++}
  #include <math.h>
  #include <math.h>
 -#endif
 -#endif
  
  

+ 4 - 3
mico/mico.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        System
 Group:        System
 License:      LGPL/GPL
 License:      LGPL/GPL
 Version:      2.3.10
 Version:      2.3.10
-Release:      20030613
+Release:      20030627
 
 
 #   package options
 #   package options
 %option       with_ssl      no
 %option       with_ssl      no
@@ -85,7 +85,8 @@ AutoReqProv:  no
 %endif
 %endif
     CPPFLAGS="%{l_cppflags}"
     CPPFLAGS="%{l_cppflags}"
     LDFLAGS="%{l_ldflags}"
     LDFLAGS="%{l_ldflags}"
-    export CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+    JAVAC=no
+    export CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS JAVAC
     ./configure \
     ./configure \
         --prefix=%{l_prefix} \
         --prefix=%{l_prefix} \
 %if "%{with_ssl}" == "yes"
 %if "%{with_ssl}" == "yes"
@@ -102,7 +103,7 @@ AutoReqProv:  no
 %endif
 %endif
         --disable-mini-stl \
         --disable-mini-stl \
         --disable-shared
         --disable-shared
-    %{l_make} %{l_mflags}
+    %{l_make} %{l_mflags -O}
 
 
 %install
 %install
     rm -rf $RPM_BUILD_ROOT
     rm -rf $RPM_BUILD_ROOT