Date: Fri, 27 Sep 2002 23:42:04 -0400 (EDT) From: Matt Loschert <loschert@servint.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/43441: [PATCH] unbreak devel/p5-ORBit Message-ID: <20020927234107.X37416-100000@magel.lan.loschert.net>
next in thread | raw e-mail | index | archive | help
>Number: 43441
>Category: ports
>Synopsis: [PATCH] unbreak devel/p5-ORBit
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 27 20:40:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Matt Loschert
>Release: FreeBSD 4.7-PRERELEASE i386
>Organization:
ServInt Corporation
>Environment:
System: FreeBSD magel.lan.loschert.net 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #0: Sat Sep 7 01:14:43 EDT 2002 loschert@magel.lan.loschert.net:/usr/obj/usr/src/sys/MAGELLAN i386
>Description:
[PATCH] unbreak devel/p5-ORBit
>How-To-Repeat:
attempt to install the port
>Fix:
add the following patch files to the port:
patch-aa
----------------------------------------
--- Makefile.PL.orig Fri Sep 27 22:33:14 2002
+++ Makefile.PL Fri Sep 27 22:38:08 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,10 +42,10 @@
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',
----------------------------------------
patch-ab
----------------------------------------
--- demarshal.c.orig Fri Sep 27 22:43:09 2002
+++ demarshal.c Fri Sep 27 22:43:36 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
----------------------------------------
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020927234107.X37416-100000>