Date: Sat, 16 Aug 2014 18:18:57 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365116 - head/devel/libreadline-java/files Message-ID: <201408161818.s7GIIvxk085275@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Aug 16 18:18:57 2014 New Revision: 365116 URL: http://svnweb.freebsd.org/changeset/ports/365116 QAT: https://qat.redports.org/buildarchive/r365116/ Log: Try to fix build on -current. Untested because java is ridiculous. Modified: head/devel/libreadline-java/files/patch-src-native-Makefile Modified: head/devel/libreadline-java/files/patch-src-native-Makefile ============================================================================== --- head/devel/libreadline-java/files/patch-src-native-Makefile Sat Aug 16 18:10:19 2014 (r365115) +++ head/devel/libreadline-java/files/patch-src-native-Makefile Sat Aug 16 18:18:57 2014 (r365116) @@ -1,6 +1,6 @@ ---- src/native/Makefile.orig 2003-01-07 11:14:35.000000000 +0100 -+++ src/native/Makefile 2013-12-13 08:29:23.000000000 +0100 -@@ -38,25 +38,28 @@ +--- src/native/Makefile.orig 2003-01-07 05:14:35.000000000 -0500 ++++ src/native/Makefile 2014-08-16 14:17:39.000000000 -0400 +@@ -38,25 +38,31 @@ INCLUDES = -I "c:/Programme/DevStudio/VC/include" \ -I $(JAVAINCLUDE) -I $(JAVANATINC) LIB = "c:/Programme/DevStudio/VC/lib" @@ -17,6 +17,9 @@ +ifeq (JavaEditline,$(TG)) +LIBPATH = -L$(LOCALBASE)/lib -rpath $(LOCALBASE)/lib +endif ++ifeq (JavaReadline,$(TG)) ++LIBPATH = -L$(LOCALBASE)/lib -rpath $(LOCALBASE)/lib ++endif JavaReadline_LIBS = -lreadline -ltermcap -lhistory -JavaEditline_LIBS = -ledit -ltermcap +JavaEditline_LIBS = $(LOCALBASE)/lib/libedit.so -ltermcap @@ -35,7 +38,7 @@ OBJECTS := org_gnu_readline_Readline.$(OBJ_EXT) -@@ -69,13 +72,13 @@ +@@ -69,13 +75,13 @@ lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT) JavaReadline: @@ -52,7 +55,7 @@ $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS) ifeq (MSC,$(WIN32)) -@@ -110,7 +113,7 @@ +@@ -110,7 +116,7 @@ -c org_gnu_readline_Readline.c org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408161818.s7GIIvxk085275>