* [gentoo-commits] gentoo-x86 commit in sci-libs/cbflib/files: 0.9.2.3-Makefile.patch
@ 2012-01-25 15:34 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2012-01-25 15:34 UTC (permalink / raw
To: gentoo-commits
jlec 12/01/25 15:34:01
Added: 0.9.2.3-Makefile.patch
Log:
Version Bump
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.1 sci-libs/cbflib/files/0.9.2.3-Makefile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.2.3-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.2.3-Makefile.patch?rev=1.1&content-type=text/plain
Index: 0.9.2.3-Makefile.patch
===================================================================
From 44e303d998c72d5d502705895a536b3657a7c4c5 Mon Sep 17 00:00:00 2001
Message-Id: <44e303d998c72d5d502705895a536b3657a7c4c5.1323790511.git.jlec@gentoo.org>
From: Justin Lecher <jlec@gentoo.org>
Date: Tue, 13 Dec 2011 16:10:43 +0100
Subject: [PATCH] 0.9.0 Makefile.patch
Conflicts:
Makefile_LINUX_gcc42
---
Makefile_LINUX_gcc42 | 63 ++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
index a74be5f..1cfb066 100644
--- a/Makefile_LINUX_gcc42
+++ b/Makefile_LINUX_gcc42
@@ -250,7 +250,10 @@
# Version string
-VERSION = 0.9.2
+MAJOR = 0
+MINOR = 9
+MICRO = 3
+VERSION = ${MAJOR}.${MINOR}.${MICRO}
#
@@ -290,7 +293,7 @@ SHAR = /usr/bin/shar
#
# Program to use to create archives
#
-AR = /usr/bin/ar
+AR = ar
#
# Program to use to add an index to an archive
@@ -300,13 +303,13 @@ RANLIB = /usr/bin/ranlib
#
# Program to use to decompress a data file
#
-DECOMPRESS = /usr/bin/bunzip2
+DECOMPRESS = bunzip2
#
# Program to use to compress a data file
#
-COMPRESS = /usr/bin/bzip2
+COMPRESS = bzip2
#
# Program to use to generate a signature
@@ -509,21 +512,18 @@ SOURCE = $(SRC)/cbf.c \
F90SOURCE = $(SRC)/fcb_atol_wcnt.f90 \
- $(SRC)/fcb_ci_strncmparr.f90 \
- $(SRC)/fcb_exit_binary.f90 \
- $(SRC)/fcb_nblen_array.f90 \
- $(SRC)/fcb_next_binary.f90 \
- $(SRC)/fcb_open_cifin.f90 \
- $(SRC)/fcb_packed.f90 \
- $(SRC)/fcb_read_bits.f90 \
- $(SRC)/fcb_read_byte.f90 \
- $(SRC)/fcb_read_image.f90 \
- $(SRC)/fcb_read_line.f90 \
- $(SRC)/fcb_read_xds_i2.f90 \
- $(SRC)/fcb_skip_whitespace.f90 \
- $(EXAMPLES)/test_fcb_read_image.f90 \
- $(EXAMPLES)/test_xds_binary.f90
-
+ $(SRC)/fcb_ci_strncmparr.f90 \
+ $(SRC)/fcb_exit_binary.f90 \
+ $(SRC)/fcb_nblen_array.f90 \
+ $(SRC)/fcb_next_binary.f90 \
+ $(SRC)/fcb_open_cifin.f90 \
+ $(SRC)/fcb_packed.f90 \
+ $(SRC)/fcb_read_bits.f90 \
+ $(SRC)/fcb_read_byte.f90 \
+ $(SRC)/fcb_read_image.f90 \
+ $(SRC)/fcb_read_line.f90 \
+ $(SRC)/fcb_read_xds_i2.f90 \
+ $(SRC)/fcb_skip_whitespace.f90
#
# Header files
@@ -701,7 +701,7 @@ all:: $(BIN)/test_xds_binary \
$(BIN)/test_fcb_read_image
endif
-shared: $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
+shared: $(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
@@ -915,25 +915,27 @@ ifneq ($(RANLIB),)
$(RANLIB) $@
endif
-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
- $(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS)
- rm *.o
+$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+ mv *.o $(SOLIB)
+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS)
+ ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
#
# IMG library
#
$(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB)
- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
$(AR) cr $@ img.o
ifneq ($(RANLIB),)
$(RANLIB) $@
endif
rm img.o
-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
- $(CC) -o $@ img.o $(SOLDFLAGS)
+$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ $(CC) $(CFLAGS) $(SOCFLAGS) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o
+ ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
rm img.o
#
@@ -957,10 +959,11 @@ else
echo "Define F90C to build $(LIB)/libfcb.a"
endif
-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
ifneq ($(F90C),)
$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
- $(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
+ $(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o
+ ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
rm *.o
else
echo "Define F90C to build $(SOLIB)/libfcb.so"
--
1.7.8
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cbflib/files: 0.9.2.3-Makefile.patch
@ 2012-05-30 13:30 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2012-05-30 13:30 UTC (permalink / raw
To: gentoo-commits
jlec 12/05/30 13:30:19
Modified: 0.9.2.3-Makefile.patch
Log:
sci-libs/cbflib: Fix underlinking
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-libs/cbflib/files/0.9.2.3-Makefile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.2.3-Makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.2.3-Makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.2.3-Makefile.patch?r1=1.1&r2=1.2
Index: 0.9.2.3-Makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cbflib/files/0.9.2.3-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0.9.2.3-Makefile.patch 25 Jan 2012 15:34:00 -0000 1.1
+++ 0.9.2.3-Makefile.patch 30 May 2012 13:30:19 -0000 1.2
@@ -126,7 +126,7 @@
- $(CC) -o $@ img.o $(SOLDFLAGS)
+$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ $(CC) $(CFLAGS) $(SOCFLAGS) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
-+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o
++ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o -lm
+ ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
rm img.o
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-30 13:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 13:30 [gentoo-commits] gentoo-x86 commit in sci-libs/cbflib/files: 0.9.2.3-Makefile.patch Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2012-01-25 15:34 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox