[patch/libdecnumber] Fix to compile with Solaris make

[patch/libdecnumber] Fix to compile with Solaris make

[Thiago Jung Bauermann]

[-- Attachment #1: Type: text/plain, Size: 773 bytes --]

Hi folks,

My previous patch to the libdecnumber build system enabled libdecnumber
to be built by native make on *BSD, but Solaris' make still doens't
work.

The problem is that in that version of make, the $< automatic variable
is not set for targets that have an explicit compilation rule instead of
using the .c.o default rule.

This patch substitutes the $< variable for the explicit name of the
source file which should be compiled in those targets that define a
compilation rule.

It also prepends $(srcdir) to the path of files that reside in a
subdirectory of the libdecnumber source tree, for completeness.

I tested by compiling libdecnumber on Solaris, Linux and OpenBSD.

Is this ok?
-- 
[]'s
Thiago Jung Bauermann
Software Engineer
IBM Linux Technology Center

[-- Attachment #2: fix-solaris-build.diff --]
[-- Type: text/x-patch, Size: 3000 bytes --]

2007-11-07  Thiago Jung Bauermann  <bauerman@br.ibm.com>

	* Makefile.in (decimal32.o): Prepend $(srcdir) to dependencies
	and substitute $< for the source file in compilation command.
	(decimal64.o): Likewise.
	(decimal128.o): Likewise.
	(bid2dpd_dpd2bid.o): Likewise.
	(host-ieee32.o): Likewise.
	(host-ieee64.o): Likewise.
	(host-ieee128.o): Likewise.

Index: libdecnumber/Makefile.in
===================================================================
--- libdecnumber.orig/Makefile.in	2007-11-07 15:40:51.000000000 -0200
+++ libdecnumber/Makefile.in	2007-11-07 15:55:17.000000000 -0200
@@ -115,30 +115,30 @@ decContext.o: decContext.c decContext.h 
 	decContextSymbols.h
 decNumber.o:  decNumber.c decNumber.h decContext.h decNumberLocal.h \
 	decNumberSymbols.h
-decimal32.o:  $(enable_decimal_float)/decimal32.c \
-   $(enable_decimal_float)/decimal32.h \
-   $(enable_decimal_float)/decimal32Symbols.h \
+decimal32.o:  $(srcdir)/$(enable_decimal_float)/decimal32.c \
+   $(srcdir)/$(enable_decimal_float)/decimal32.h \
+   $(srcdir)/$(enable_decimal_float)/decimal32Symbols.h \
    decNumber.h decContext.h decNumberLocal.h
-	$(COMPILE) $<
-decimal64.o:  $(enable_decimal_float)/decimal64.c \
-   $(enable_decimal_float)/decimal64.h \
-   $(enable_decimal_float)/decimal64Symbols.h \
+	$(COMPILE) $(srcdir)/$(enable_decimal_float)/decimal32.c
+decimal64.o:  $(srcdir)/$(enable_decimal_float)/decimal64.c \
+   $(srcdir)/$(enable_decimal_float)/decimal64.h \
+   $(srcdir)/$(enable_decimal_float)/decimal64Symbols.h \
    decNumber.h decContext.h decNumberLocal.h
-	$(COMPILE) $<
-decimal128.o:  $(enable_decimal_float)/decimal128.c \
-   $(enable_decimal_float)/decimal128.h \
-   $(enable_decimal_float)/decimal128Symbols.h\
-   $(enable_decimal_float)/decimal128Local.h\
+	$(COMPILE) $(srcdir)/$(enable_decimal_float)/decimal64.c
+decimal128.o:  $(srcdir)/$(enable_decimal_float)/decimal128.c \
+   $(srcdir)/$(enable_decimal_float)/decimal128.h \
+   $(srcdir)/$(enable_decimal_float)/decimal128Symbols.h\
+   $(srcdir)/$(enable_decimal_float)/decimal128Local.h\
    decNumber.h decContext.h decNumberLocal.h 
-	$(COMPILE) $<
-bid2dpd_dpd2bid.o : bid/bid2dpd_dpd2bid.c bid/bid2dpd_dpd2bid.h
-	$(COMPILE) $<
-host-ieee32.o : bid/host-ieee32.c bid/decimal32.h
-	$(COMPILE) $<
-host-ieee64.o : bid/host-ieee64.c bid/decimal64.h
-	$(COMPILE) $<
-host-ieee128.o : bid/host-ieee128.c bid/decimal128.h
-	$(COMPILE) $<
+	$(COMPILE) $(srcdir)/$(enable_decimal_float)/decimal128.c
+bid2dpd_dpd2bid.o : $(srcdir)/bid/bid2dpd_dpd2bid.c $(srcdir)/bid/bid2dpd_dpd2bid.h
+	$(COMPILE) $(srcdir)/bid/bid2dpd_dpd2bid.c
+host-ieee32.o : $(srcdir)/bid/host-ieee32.c $(srcdir)/bid/decimal32.h
+	$(COMPILE) $(srcdir)/bid/host-ieee32.c
+host-ieee64.o : $(srcdir)/bid/host-ieee64.c $(srcdir)/bid/decimal64.h
+	$(COMPILE) $(srcdir)/bid/host-ieee64.c
+host-ieee128.o : $(srcdir)/bid/host-ieee128.c $(srcdir)/bid/decimal128.h
+	$(COMPILE) $(srcdir)/bid/host-ieee128.c
 # Other miscellaneous targets.
 
 mostlyclean:

Re: [patch/libdecnumber] Fix to compile with Solaris make

[Ben Elliston]

> My previous patch to the libdecnumber build system enabled libdecnumber
> to be built by native make on *BSD, but Solaris' make still doens't
> work.

This is OK, thanks.

Ben

Re: [patch/libdecnumber] Fix to compile with Solaris make

[Thiago Jung Bauermann]

On Mon, 2007-11-26 at 12:14 -0600, Peter Bergner wrote:
> On Fri, Nov 09, 2007 at 10:51:01AM +1100, Ben Elliston wrote:
> > > My previous patch to the libdecnumber build system enabled libdecnumber
> > > to be built by native make on *BSD, but Solaris' make still doens't
> > > work.
> > 
> > This is OK, thanks.
> 
> I committed this for Thiago as revision 130442.

Unfortunately this didn't show up in the src repository yet. Could
someone please help with this?
-- 
[]'s
Thiago Jung Bauermann
Software Engineer
IBM Linux Technology Center

Re: [patch/libdecnumber] Fix to compile with Solaris make

[Ben Elliston]

Hi Thiago

> Unfortunately this didn't show up in the src repository yet. Could
> someone please help with this?

I diffed the two directories and indeed this was the only difference, so
I've copied the patch over to src.  Sorry, I didn't realise that there
was a cloned copy in src until just now.  :-)

Cheers, Ben