diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2002-10-15 12:42:06 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2002-10-15 12:42:06 +0000 |
| commit | e484b20eb8e27a274e83ee8cd2ff2f99dc25255e (patch) | |
| tree | f1d02201c35158852e4419ed65d2056cc3e3ff2d /devel | |
| parent | Updated to 1.1.2 (diff) | |
Unbreak p5-ORBit.
PR: ports/43441
Submitted by: Matt Loschert <loschert@servint.com>
Notes
Notes:
svn path=/head/; revision=68098
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/p5-ORBit/files/patch-Makefile.PL | 48 | ||||
| -rw-r--r-- | devel/p5-ORBit/files/patch-demarshal.c | 11 |
2 files changed, 59 insertions, 0 deletions
diff --git a/devel/p5-ORBit/files/patch-Makefile.PL b/devel/p5-ORBit/files/patch-Makefile.PL new file mode 100644 index 000000000000..1e226efb0eed --- /dev/null +++ b/devel/p5-ORBit/files/patch-Makefile.PL @@ -0,0 +1,48 @@ +--- Makefile.PL.orig Wed Oct 25 15:27:13 2000 ++++ Makefile.PL Tue Oct 15 20:38:18 2002 +@@ -14,9 +14,9 @@ + server.o + types.o); + +-$orbit_cflags = `orbit-config --cflags client server`; ++chomp($orbit_cflags = `orbit-config --cflags client server`); + undef $orbit_cflags if $?; +-$orbit_libs = `orbit-config --libs client server`; ++chomp($orbit_libs = `orbit-config --libs client server`); + undef $orbit_libs if $?; + + if (!defined $orbit_libs) { +@@ -24,6 +24,16 @@ + exit 1; + } + ++chomp($idl_cflags = `libIDL-config --cflags`); ++undef $idl_cflags if $?; ++chomp($idl_libs = `libIDL-config --libs`); ++undef $idl_libs if $?; ++ ++if (!defined $idl_libs) { ++ print STDERR "libIDL-config not found\n"; ++ exit 1; ++} ++ + if ($] < 5.0045) { + print STDERR "Using compatibility macros/routines for Perl 5.004\n"; + push @OBJECTS,'constsub.o'; +@@ -32,13 +42,13 @@ + WriteMakefile( + 'NAME' => 'CORBA::ORBit', + 'VERSION_FROM' => 'ORBit.pm', +- 'LIBS' => [$orbit_libs." -lIDL"], ++ 'LIBS' => ["$orbit_libs $idl_libs"], + 'DEFINE' => + ($] < 5.0045 ? '-DPERL5004_COMPAT ' : ''), +- 'INC' => $orbit_cflags, ++ 'INC' => "$orbit_cflags $idl_cflags", + 'OBJECT' => join(" ", @OBJECTS), + # 'XSOPT' => '-nolinenumbers', +- 'OPTIMIZE' => '-g -Wall', ++ 'OPTIMIZE' => '-Wall', + # 'OPTIMIZE' => '-O2 -Wall', + 'MAP_TARGET' => 'orbitperl', + # 'MAKEAPERL' => 1, diff --git a/devel/p5-ORBit/files/patch-demarshal.c b/devel/p5-ORBit/files/patch-demarshal.c new file mode 100644 index 000000000000..23b4c9608eba --- /dev/null +++ b/devel/p5-ORBit/files/patch-demarshal.c @@ -0,0 +1,11 @@ +--- demarshal.c.orig Mon Oct 16 03:32:32 2000 ++++ demarshal.c Tue Oct 15 20:35:32 2002 +@@ -7,7 +7,7 @@ + #include "types.h" + + #define RECV_BUFFER_LEFT(buf) \ +- (((guchar *)buf->message_body + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar *)buf->cur) ++ (((guchar *)buf->message_body + 12 + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar *)buf->cur) + + + static CORBA_boolean |