diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
| commit | 2df76eb0a73bb59d817aa60758a5f10e3e544c3b (patch) | |
| tree | 07e10c49034b87755dafb03956ad93c5363e0bb7 /graphics/urt | |
| parent | 1c97f613254a72e0ae97ea8d817ebe38096d6949 (diff) | |
Notes
Diffstat (limited to 'graphics/urt')
| -rw-r--r-- | graphics/urt/files/patch-config::urt | 4 | ||||
| -rw-r--r-- | graphics/urt/files/patch-lib::makefile.src | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/graphics/urt/files/patch-config::urt b/graphics/urt/files/patch-config::urt index e38fc0f8d0a5..262d91126a6b 100644 --- a/graphics/urt/files/patch-config::urt +++ b/graphics/urt/files/patch-config::urt @@ -138,7 +138,7 @@ #endif #ifdef SUNRASTER|SUNTOOLS|TAAC1 -@@ -216,9 +219,12 @@ +@@ -216,9 +219,10 @@ #ifdef TIFF # Location of tiff library and include files. Relative to URT root directory. @@ -148,9 +148,7 @@ +##defpath TIFFDIR +INCTIFF = -I${LOCALBASE}/include +LIBTIFF = -L${LOCALBASE}/lib -ltiff -+.if ${PORTOBJFORMAT} == "elf" +LIBTIFF +=-Wl,-rpath,${LOCALBASE}/lib -+.endif #endif #ifdef X10 diff --git a/graphics/urt/files/patch-lib::makefile.src b/graphics/urt/files/patch-lib::makefile.src index dfb6034e5d5e..8d5f8a6cb2b5 100644 --- a/graphics/urt/files/patch-lib::makefile.src +++ b/graphics/urt/files/patch-lib::makefile.src @@ -1,6 +1,6 @@ --- lib/makefile.src.orig Thu Mar 5 04:32:53 1992 +++ lib/makefile.src Sat Dec 28 00:41:59 2002 -@@ -26,7 +26,14 @@ +@@ -26,7 +26,10 @@ vaxshort.o \ $(OPT_OBJS) @@ -8,15 +8,11 @@ +SOOBJS = $(OBJS:.o=.so) + +LIBANAME = librle.a -+.if $(PORTOBJFORMAT) == "elf" +LIBSONAME = librle.so.1 -+.else -+LIBSONAME = librle.so.1.0 -+.endif # Just rebuild the object files. objs: $(OBJS) -@@ -37,40 +44,46 @@ +@@ -37,40 +44,40 @@ # Do nothing if $(DEST) is empty (or not defined) install: buildlib @sh -c "if test '$(DEST)x' != x ; then \ @@ -74,15 +70,9 @@ + $(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so + $(LD) -X -r $*.so + -+.if $(PORTOBJFORMAT) == "elf" +$(LIBSONAME): $(SOOBJS) + -rm -f $@ + ld -shared -soname $@ -o $@ $(SOOBJS) -+.else -+$(LIBSONAME): $(SOOBJS) -+ -rm -f $@ -+ ld -Bshareable -o $@ $(SOOBJS) -+.endif # Clean up installed stuff and binaries pristine: clean |