[Kstars-devel] branches/KDE/3.5/kdeedu/kstars/kstars

[Jasem Mutlaq]

SVN commit 465639 by mutlaqja:

pplying patch to make kstars work with uclibc. Will forward port to
trunk.

CCMAIL: 113577-done at bugs.kde.org
CCMAIL: kstars-devel at kde.org



 M  +1 -1      dms.cpp  
 M  +4 -4      indi/Makefile.am  
 M  +1 -1      indi/indicom.c  
 M  +1 -1      kstars.cpp  
 M  +1 -1      skymap.cpp  


--- branches/KDE/3.5/kdeedu/kstars/kstars/dms.cpp #465638:465639
@@ -241,7 +241,7 @@
 		*/
 
 	if ( scDirty ) {
-                #ifdef __GLIBC__
+                #ifdef __GLIBC__ && !defined(__UCLIBC__)
                 #if ( __GLIBC__ >= 2 && __GLIBC_MINOR__ >=1 )
 		//GNU version
 		sincos( radians(), &Sin, &Cos );
--- branches/KDE/3.5/kdeedu/kstars/kstars/indi/Makefile.am #465638:465639
@@ -15,13 +15,13 @@
 indiserver_LDADD = liblilxml.a -lpthread $(LIBSOCKET)
 
 lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp
-lx200generic_LDADD = liblilxml.a libindicom.a
+lx200generic_LDADD = liblilxml.a libindicom.a -lm
 
 lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp
 lx200basic_LDADD = liblilxml.a libindicom.a
 
 celestrongps_SOURCES =  indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp
-celestrongps_LDADD = liblilxml.a libindicom.a
+celestrongps_LDADD = liblilxml.a libindicom.a -lm
 
 apmount_SOURCES = indidrivermain.c base64.c eventloop.c  lx200driver.c apmount.cpp
 apmount_LDADD =  liblilxml.a libindicom.a
@@ -33,10 +33,10 @@
 fliwheel_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm
 
 v4ldriver_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_v4l.cpp
-v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz
+v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz
 
 v4lphilips_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp v4lphilips.cpp indi_philips.cpp
-v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz
+v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz
 
 meade_lpi_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_lpi.cpp
 meade_lpi_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz
--- branches/KDE/3.5/kdeedu/kstars/kstars/indi/indicom.c #465638:465639
@@ -213,7 +213,7 @@
 
 		if (rDirty)
 		{
-                #ifdef __GLIBC__
+                #ifdef __GLIBC__  && !defined(__UCLIBC__)
                 #if ( __GLIBC__ >= 2 && __GLIBC_MINOR__ >=1 )
 		/* GNU version */
 		sincos( DegToRad(Degrees), &Sin, &Cos );
--- branches/KDE/3.5/kdeedu/kstars/kstars/kstars.cpp #465638:465639
@@ -87,7 +87,7 @@
 	//store original color scheme
 	OriginalPalette = QApplication::palette();
 
-	#if ( __GLIBC__ >= 2 &&__GLIBC_MINOR__ >= 1 )
+	#if ( __GLIBC__ >= 2 &&__GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__))
 	kdDebug() << "glibc >= 2.1 detected.  Using GNU extension sincos()" << endl;
 	#else
 	kdDebug() << "Did not find glibc >= 2.1.  Will use ANSI-compliant sin()/cos() functions." << endl;
--- branches/KDE/3.5/kdeedu/kstars/kstars/skymap.cpp #465638:465639
@@ -1028,7 +1028,7 @@
   }
 
 	//Convert dX, Y coords to screen pixel coords.
-	#if ( __GLIBC__ >= 2 && __GLIBC_MINOR__ >=1 )
+	#if ( __GLIBC__ >= 2 && __GLIBC_MINOR__ >=1 ) && !defined(__UCLIBC__)
 	//GNU version
 	sincos( dX, &sindX, &cosdX );
 	sincos( Y, &sinY, &cosY );