| 1 |
caleb 08/04/23 13:25:22 |
| 2 |
|
| 3 |
Added: Ice-3.3.0_beta1-Makefile.patch |
| 4 |
Log: |
| 5 |
Version bump, currently masked |
| 6 |
(Portage version: 2.1.5_rc4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-cpp/Ice/files/Ice-3.3.0_beta1-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/Ice/files/Ice-3.3.0_beta1-Makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/Ice/files/Ice-3.3.0_beta1-Makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: Ice-3.3.0_beta1-Makefile.patch |
| 15 |
=================================================================== |
| 16 |
--- config/Make.rules.orig 2008-04-02 07:40:44.000000000 -0400 |
| 17 |
+++ config/Make.rules 2008-04-02 07:45:56.000000000 -0400 |
| 18 |
@@ -11,13 +11,13 @@ |
| 19 |
# Select an installation base directory. The directory will be created |
| 20 |
# if it does not exist. |
| 21 |
# |
| 22 |
-prefix ?= /opt/Ice-$(VERSION) |
| 23 |
+prefix ?= /$(DESTDIR)/usr |
| 24 |
|
| 25 |
# |
| 26 |
# The "root directory" for runpath embedded in executables. Can be unset |
| 27 |
# to avoid adding a runpath to Ice executables. |
| 28 |
# |
| 29 |
-embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) |
| 30 |
+#embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) |
| 31 |
|
| 32 |
# |
| 33 |
# Define OPTIMIZE as yes if you want to build with |
| 34 |
@@ -125,7 +125,7 @@ |
| 35 |
endif |
| 36 |
|
| 37 |
install_includedir = $(prefix)/include |
| 38 |
-install_docdir = $(prefix)/doc |
| 39 |
+install_docdir = $(prefix)/share/doc/Ice-$(VERSION) |
| 40 |
|
| 41 |
bindir = $(top_srcdir)/bin |
| 42 |
libdir = $(top_srcdir)/lib |
| 43 |
@@ -161,18 +161,8 @@ |
| 44 |
BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2 |
| 45 |
BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir))) |
| 46 |
|
| 47 |
-ifneq ($(DB_HOME),) |
| 48 |
- DB_FLAGS = -I$(DB_HOME)/include |
| 49 |
- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx |
| 50 |
- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)) |
| 51 |
-else |
| 52 |
- ifeq ($(shell if [ -d /usr/include/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes) |
| 53 |
- DB_FLAGS = -I/usr/include/db46 |
| 54 |
- DB_LIBS = -L/usr/$(libsubdir)/db46 -ldb_cxx |
| 55 |
- else |
| 56 |
- DB_LIBS = -ldb_cxx |
| 57 |
- endif |
| 58 |
-endif |
| 59 |
+DB_FLAGS = -I/usr/include/db4.6 |
| 60 |
+DB_LIBS = -L/usr/$(libsubdir) -ldb_cxx-4.6 |
| 61 |
|
| 62 |
EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include) |
| 63 |
EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat |
| 64 |
--- Makefile.orig 2008-04-02 09:51:02.000000000 -0400 |
| 65 |
+++ Makefile 2008-04-02 09:51:18.000000000 -0400 |
| 66 |
@@ -11,11 +11,11 @@ |
| 67 |
|
| 68 |
include $(top_srcdir)/config/Make.rules |
| 69 |
|
| 70 |
-SUBDIRS = config src include test demo |
| 71 |
+SUBDIRS = config src include |
| 72 |
|
| 73 |
INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) |
| 74 |
|
| 75 |
-install:: install-common |
| 76 |
+install:: |
| 77 |
@for subdir in $(INSTALL_SUBDIRS); \ |
| 78 |
do \ |
| 79 |
if test ! -d $$subdir ; \ |
| 80 |
--- config/Makefile.orig 2008-04-02 10:33:40.000000000 -0400 |
| 81 |
+++ config/Makefile 2008-04-02 10:34:26.000000000 -0400 |
| 82 |
@@ -15,15 +15,15 @@ |
| 83 |
echo "" |
| 84 |
|
| 85 |
install:: |
| 86 |
- @if test ! -d $(prefix)/config ; \ |
| 87 |
+ @if test ! -d $(prefix)/share/Ice/config ; \ |
| 88 |
then \ |
| 89 |
- echo "Creating $(prefix)/config..." ; \ |
| 90 |
- $(call mkdir,$(prefix)/config) ; \ |
| 91 |
+ echo "Creating $(prefix)/share/Ice/config..." ; \ |
| 92 |
+ mkdir -p $(prefix)/share/Ice/config ; \ |
| 93 |
fi |
| 94 |
- $(call installdata,templates.xml,$(prefix)/config) |
| 95 |
- $(call installdata,convertssl.py,$(prefix)/config) |
| 96 |
- $(call installdata,upgradeicegrid.py,$(prefix)/config) |
| 97 |
- $(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/config) |
| 98 |
- $(call installdata,icegrid-slice.3.2.ice.gz,$(prefix)/config) |
| 99 |
- $(call installdata,icegrid-slice.3.3.ice.gz,$(prefix)/config) |
| 100 |
+ $(call installdata,templates.xml,$(prefix)/share/Ice/config) |
| 101 |
+ $(call installdata,convertssl.py,$(prefix)/share/Ice/config) |
| 102 |
+ $(call installdata,upgradeicegrid.py,$(prefix)/share/Ice/config) |
| 103 |
+ $(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/share/Ice/config) |
| 104 |
+ $(call installdata,icegrid-slice.3.2.ice.gz,$(prefix)/share/Ice/config) |
| 105 |
+ $(call installdata,icegrid-slice.3.3.ice.gz,$(prefix)/share/Ice/config) |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
-- |
| 111 |
gentoo-commits@l.g.o mailing list |
Archives