[SCM] Image Reduction and Analysis Facility branch, debian, updated. c7753fe44827b2c0eb4f05492a2c20a6ef4b0b2b

Ole Streicher debian at liska.ath.cx
Wed Jun 5 05:42:40 UTC 2013 

The following commit has been merged in the debian branch:
commit c7753fe44827b2c0eb4f05492a2c20a6ef4b0b2b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 5 07:42:30 2013 +0200

    Propagate more CFLAGS and CC; set CC in debian/rules

diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
index 9555fe0..6e14e1f 100644
--- a/debian/patches/cflags.patch
+++ b/debian/patches/cflags.patch
@@ -16,7 +16,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  
  %.o: %.c $(INCS)
 -	/usr/bin/gcc -Wall $(CINCS) $(CFLAGS) -c $< -o $@
-+	$(CC) -Wall $(CINCS) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
  
  
  #=======================
@@ -25,7 +25,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  	/usr/bin/ar rv $@ $?
  Static/%.o: %.c $(INCS)
 -	/usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CINCS) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
  Static:
  	/bin/mkdir $@
  	chmod 777 $@
@@ -34,7 +34,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  	/usr/bin/ld -shared -o $@ $? -lc -ldl
  Shared/%.o: %.c $(INCS)
 -	/usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
-+	$(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++	$(CC) $(CFLAGS) -fpic -shared -c $< -o $@
  Shared:
  	/bin/mkdir $@
  	chmod 777 $@
@@ -131,7 +131,15 @@ Description: Propagate CFLAGS and CC to Makefiles.
  	chmod 777 $@
 --- a/vendor/Makefile
 +++ b/vendor/Makefile
-@@ -29,7 +29,7 @@
+@@ -17,7 +17,6 @@
+ 
+ 
+ # includes, flags and libraries
+-CC 	  	= gcc
+ CINCS  	  	= -I$(INCDIR) -I./
+ ifeq  ($(PLATFORM), "Darwin")
+     ifeq  ($(PLATFORM), "x86_64")
+@@ -29,7 +28,7 @@
      CARCH	= 
  endif
  
@@ -140,7 +148,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  LIBS		= -lm -lc -lpthread
  
  
-@@ -61,7 +61,7 @@
+@@ -61,7 +60,7 @@
  $(STATICLIB): $(SRCS:%.c=Static/%.o)
  	/usr/bin/ar rv $@ $?
  Static/%.o: %.c $(INCS)
@@ -149,7 +157,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  Static:
  	/bin/mkdir $@
  	chmod 777 $@
-@@ -69,7 +69,7 @@
+@@ -69,7 +68,7 @@
  $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
  	/usr/bin/ld -shared -o $@ $? -lc -ldl
  Shared/%.o: %.c $(INCS)
@@ -160,18 +168,25 @@ Description: Propagate CFLAGS and CC to Makefiles.
  	chmod 777 $@
 --- a/Makefile
 +++ b/Makefile
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,6 @@
  # Compiler Flags.
  
  RELEASE		= v2.16
 -CFLAGS 		=
-+#CFLAGS 		=
  CDEBUGFLAGS 	= -O2 -Wall
  BOOTSTRAPCFLAGS = 
          
 --- a/vendor/voclient/Makefile
 +++ b/vendor/voclient/Makefile
-@@ -32,7 +32,6 @@
+@@ -20,7 +20,6 @@
+ 
+ 
+ # includes, flags and libraries
+-CC 	  	= gcc
+ CINCS  	  	= -I$(INCDIR) -I./
+ ifeq  ($(PLATFORM), "Darwin")
+     ifeq  ($(PLATFORM), "x86_64")
+@@ -32,7 +31,6 @@
      CARCH	= 
  endif
  
@@ -179,7 +194,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  LIBS		= -lm -lc -lpthread
  
  
-@@ -100,7 +99,7 @@
+@@ -100,7 +98,7 @@
  $(STATICLIB): $(SRCS:%.c=Static/%.o)
  	/usr/bin/ar rv $@ $?
  Static/%.o: %.c $(INCS)
@@ -188,7 +203,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  Static:
  	/bin/mkdir $@
  	chmod 777 $@
-@@ -108,7 +107,7 @@
+@@ -108,7 +106,7 @@
  $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
  	/usr/bin/ld -shared -o $@ $? -lc -ldl
  Shared/%.o: %.c $(INCS)
@@ -199,7 +214,15 @@ Description: Propagate CFLAGS and CC to Makefiles.
  	chmod 777 $@
 --- a/vendor/voclient/libsamp/Makefile
 +++ b/vendor/voclient/libsamp/Makefile
-@@ -40,7 +40,7 @@
+@@ -25,7 +25,6 @@
+ 
+ 
+ # includes, flags and libraries
+-CC              = gcc
+ CINCS           = -I$(INCDIR)  -I. -Ilibxrpc/include -Ilibxrpc
+ 
+ ifeq ("$(PLATFORM)", "Darwin")
+@@ -40,7 +39,7 @@
  endif
  
  CLIBS		= -lm -lc -lcurl -lpthread
@@ -208,7 +231,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  
  
  
-@@ -203,7 +203,7 @@
+@@ -203,7 +202,7 @@
  $(STATICLIB): $(SRCS:%.c=Static/%.o)
  	/usr/bin/ar r $@ $?
  Static/%.o: %.c $(INCS)
@@ -217,7 +240,7 @@ Description: Propagate CFLAGS and CC to Makefiles.
  Static:
  	/bin/mkdir $@
  	chmod 777 $@
-@@ -211,7 +211,7 @@
+@@ -211,7 +210,7 @@
  $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
  	/usr/bin/ld -shared -o $@ $? -lc -ldl
  Shared/%.o: %.c $(INCS)
@@ -252,3 +275,115 @@ Description: Propagate CFLAGS and CC to Makefiles.
  $else $ifeq (MACH, redhat) then
  $set	XFLAGS		= "-c -w"	# default XC compile flags
  $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
+--- a/vendor/voclient/common/Makefile
++++ b/vendor/voclient/common/Makefile
+@@ -17,7 +17,6 @@
+ 
+ 
+ # includes, flags and libraries
+-CC 	  	= gcc
+ CINCS  	  	= -I$(INCDIR) -I./
+ ifeq  ($(PLATFORM), "Darwin")
+     ifeq  ($(PLATFORM), "x86_64")
+@@ -31,8 +30,6 @@
+     LIBS	= -lm -lc -lpthread
+ endif
+ 
+-CFLAGS 		= -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
+-
+ 
+ all::	curl expat
+ 
+@@ -70,7 +67,7 @@
+ $(STATICLIB): $(SRCS:%.c=Static/%.o)
+ 	/usr/bin/ar rv $@ $?
+ Static/%.o: %.c $(INCS)
+-	/usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++	$(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static:
+ 	/bin/mkdir $@
+ 	chmod 777 $@
+@@ -78,7 +75,7 @@
+ $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
+ 	/usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(INCS)
+-	/usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++	$(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ Shared:
+ 	/bin/mkdir $@
+ 	chmod 777 $@
+--- a/vendor/voclient/common/mklibs
++++ b/vendor/voclient/common/mklibs
+@@ -4,7 +4,6 @@
+ set p = `pwd`
+ set top = $p:h
+ 
+-setenv CC 	"gcc"
+ setenv CXX 	"g++"
+ 
+ set	build_curl	= 0
+--- a/vendor/voclient/libsamp/Makefile.src
++++ b/vendor/voclient/libsamp/Makefile.src
+@@ -25,9 +25,7 @@
+ 
+ 
+ # includes, flags and libraries
+-CC 		= gcc
+ CINCS  		= -I$(HERE) -I../include -I./
+-CFLAGS 		= -g -D$(PLATFORM) -m32 -Wall $(CINCS)
+ LFLAGS		= -L. -L../lib
+ 
+ DBG_LIB		=
+--- a/vendor/voclient/libsamp/apps/Makefile
++++ b/vendor/voclient/libsamp/apps/Makefile
+@@ -38,14 +38,9 @@
+     CARCH       =
+ endif
+ 
+-CFLAGS          = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
+-
+-
+ 
+ # includes, flags and libraries
+-CC 	    = gcc
+ CINCS  	    = -I$(HERE) -I../ -I../../include -L../ -L../../lib/ -L../
+-CFLAGS 	    = -g -Wall -D$(PLATFORM) $(CINCS)
+ 
+ #F77 	    = g77
+ F77 	    = gfortran
+--- a/vendor/voclient/libvo/Makefile
++++ b/vendor/voclient/libvo/Makefile
+@@ -24,15 +24,11 @@
+ 
+ 
+ # includes, flags and libraries
+-CC              = gcc
+ CINCS           = -I$(INCDIR)  -I.
+ 
+ CLIBS		= -lm -lc -lcurl -lpthread
+ CARCH		= -m64 -mmacosx-version-min=10.5
+ 
+-CFLAGS 		= -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
+-
+-
+ 
+ # list of source and include files
+ SRCS 		= 
+@@ -92,7 +88,7 @@
+ $(STATICLIB): $(SRCS:%.c=Static/%.o)
+ 	/usr/bin/ar r $@ $?
+ Static/%.o: %.c $(INCS)
+-	/usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++	$(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static:
+ 	/bin/mkdir $@
+ 	chmod 777 $@
+@@ -100,7 +96,7 @@
+ $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
+ 	/usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(INCS)
+-	/usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++	$(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ Shared:
+ 	/bin/mkdir $@
+ 	chmod 777 $@
diff --git a/debian/rules b/debian/rules
index 77b0269..3601acb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ export HOST_READLINE=1
 export HOST_EXPAT=1
 export HOST_CFITSIO=1
 export IRAFARCH=$(shell ${hlib}irafarch.csh)
+export CC=gcc
 
 %:
 	dh $@

-- 
Image Reduction and Analysis Facility

More information about the debian-science-commits mailing list