summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/RPMTools.py9
-rw-r--r--cpp/config/Make.rules24
-rw-r--r--cpp/config/Make.rules.AIX4
-rw-r--r--cpp/config/Make.rules.Darwin6
-rw-r--r--cpp/config/Make.rules.HP-UX4
-rw-r--r--cpp/config/Make.rules.Linux6
-rw-r--r--cpp/config/Make.rules.SunOS4
7 files changed, 36 insertions, 21 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py
index 671616a5915..6ddb4731604 100644
--- a/cpp/RPMTools.py
+++ b/cpp/RPMTools.py
@@ -67,7 +67,7 @@ class Package:
#
minorVer = version[0:3]
ofile.write('Source0: http://www.zeroc.com/download/Ice/' + minorVer + '/Ice-%{version}.tar.gz\n')
- ofile.write('Source1: http://www.zeroc.com/download/Ice/' + minorVer + '/IceJ-%{version}.tar.gz\n')
+ ofile.write('Source1: http://www.zeroc.com/download/Ice/' + minorVer + '/IceJ-%{version}-java2.tar.gz\n')
ofile.write('Source2: http://www.zeroc.com/download/Ice/' + minorVer + '/IcePy-%{version}.tar.gz\n')
ofile.write('Source3: http://www.zeroc.com/download/Ice/' + minorVer + '/IceCS-%{version}.tar.gz\n')
ofile.write('Source4: http://www.zeroc.com/download/Ice/' + minorVer + '/Ice-%{version}-demos.tar.gz\n')
@@ -77,6 +77,7 @@ class Package:
ofile.write('Source8: http://www.zeroc.com/download/Ice/' + minorVer + '/php-5.1.4.tar.bz2\n')
ofile.write('Source9: http://www.zeroc.com/download/Ice/' + minorVer + '/IcePHP-%{version}.tar.gz\n')
ofile.write('Source10: http://www.zeroc.com/download/Ice/' + minorVer + '/iceproject.xml\n')
+ ofile.write('Source11: http://www.zeroc.com/download/Ice/' + minorVer + '/IceJ-%{version}-java5.tar.gz\n')
ofile.write('\n')
if len(installDir) != 0:
ofile.write('BuildRoot: ' + installDir + '\n')
@@ -281,7 +282,7 @@ transforms = [ ('file', 'ice.ini', 'etc/php.d/ice.ini'),
('dir', '%{icelibdir}', 'usr/%{icelibdir}'),
('file', 'usr/%{icelibdir}/icephp.so', 'usr/%{icelibdir}/php/modules/icephp.so'),
('file', 'usr/lib/Ice.jar', 'usr/lib/Ice-%version%/Ice.jar' ),
- ('file', 'usr/lib/java5/Ice.jar', 'usr/lib/Ice-%version%/java5/Ice.jar' ),
+ ('dir', 'usr/lib/java5', 'usr/lib/Ice-%version%/java5' ),
('file', 'usr/lib/IceGridGUI.jar', 'usr/lib/Ice-%version%/IceGridGUI.jar' ),
('file', 'bin/icecs.dll', 'usr/lib/mono/gac/icecs/%version%.0__1f998c50fec78381/icecs.dll'),
('file', 'bin/glacier2cs.dll',
@@ -683,9 +684,9 @@ gzip -dc $RPM_SOURCE_DIR/configure.gz > $RPM_BUILD_DIR/php-5.1.4/configure
def writeBuildCommands(ofile, version):
ofile.write("""
cd $RPM_BUILD_DIR/Ice-%{version}
-gmake OPTIMIZE=yes RPM_BUILD_ROOT=$RPM_BUILD_ROOT ADD_LIBDIR_TO_RPATH=no
+gmake OPTIMIZE=yes RPM_BUILD_ROOT=$RPM_BUILD_ROOT embedded_runpath_prefix=""
cd $RPM_BUILD_DIR/IcePy-%{version}
-gmake OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT ADD_LIBDIR_TO_RPATH=no
+gmake OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT embedded_runpath_prefix=""
cd $RPM_BUILD_DIR/IceCS-%{version}
export PATH=$RPM_BUILD_DIR/Ice-%{version}/bin:$PATH
export LD_LIBRARY_PATH=$RPM_BUILD_DIR/Ice-%{version}/lib:$LD_LIBRARY_PATH
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index f39705700c9..159244bc504 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -11,13 +11,13 @@
# Select an installation base directory. The directory will be created
# if it does not exist.
#
-prefix ?= /opt/Ice-$(VERSION)
+prefix ?= /opt/Ice-$(VERSION)
#
-# When creating an executable, shall we add install_libdir to the
-# runpath embedded in this executable?
+# The "root directory" for runpath embedded in executables. Can be unset
+# to avoid adding a runpath to Ice executables.
#
-ADD_LIBDIR_TO_RPATH ?= yes
+embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
#
# Define OPTIMIZE as yes if you want to build with
@@ -112,8 +112,12 @@ KERBEROS_HOME ?= /usr/kerberos
# ----------------------------------------------------------------------
SHELL = /bin/sh
-VERSION = 3.2.0
-SOVERSION = 32
+VERSION_MAJOR = 3
+VERSION_MINOR = 2
+VERSION_PATCH = 0
+VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
+SOVERSION = $(VERSION_MAJOR)$(VERSION_MINOR)
+
bindir = $(top_srcdir)/bin
libdir = $(top_srcdir)/lib
includedir = $(top_srcdir)/include
@@ -148,6 +152,14 @@ else
libsubdir := lib
endif
+ifneq ($(embedded_runpath_prefix),)
+ ifeq ($(LP64),yes)
+ runpath_libdir := $(embedded_runpath_prefix)/lib$(lp64suffix)
+ else
+ runpath_libdir := $(embedded_runpath_prefix)/lib
+ endif
+endif
+
ifneq ($(STLPORT_HOME),)
STLPORT_FLAGS = -I$(STLPORT_HOME)/include/stlport
ifeq ($(OPTIMIZE),yes)
diff --git a/cpp/config/Make.rules.AIX b/cpp/config/Make.rules.AIX
index 0a7fc26c200..6371d5e274f 100644
--- a/cpp/config/Make.rules.AIX
+++ b/cpp/config/Make.rules.AIX
@@ -43,8 +43,8 @@ else
CXXFLAGS += -g
endif
-ifeq ($(ADD_LIBDIR_TO_RPATH),yes)
- LDPLATFORMFLAGS = -Wl,-blibpath:$(install_libdir):/usr/lpp/xlopt:/usr/lib/threads:/usr/vacpp/lib:/usr/lib:/lib
+ifneq ($(embedded_runpath_prefix),)
+ LDPLATFORMFLAGS = -Wl,-blibpath:$(runpath_libdir):/usr/lpp/xlopt:/usr/lib/threads:/usr/vacpp/lib:/usr/lib:/lib
else
LDPLATFORMFLAGS = -Wl,-blibpath:/usr/lpp/xlopt:/usr/lib/threads:/usr/vacpp/lib:/usr/lib:/lib
endif
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 1c7240d1c41..47804044dd2 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -33,15 +33,17 @@ mksoname = $(if $(2),lib$(1).$(2).dylib,lib$(1).dylib)
mklibname = lib$(1).dylib
curdir = $(shell pwd)
+
ifeq ($(OPTIMIZE),yes)
- mkshlib = $(CXX) -single_module -dynamiclib $(shlibldflags) -o $(1) -install_name $(install_libdir)/$(2) $(3) $(4)
+ mkshlib = $(CXX) -single_module -dynamiclib $(shlibldflags) -o $(1) -install_name $(runpath_libdir)/$(2) $(3) $(4)
else
# Don't use -install_name if we're building a debug version. GDB doesn't honor the
- # DYLD_LIBRARY_PATH environment variable if an install_name is embedded in the
+ # DYLD_LIBRARY_PATH environment variable if a runpath is embedded in the
# executables or libraries.
mkshlib = $(CXX) -single_module -dynamiclib $(shlibldflags) -o $(1) $(3) $(4)
endif
+
BASELIBS = -lIceUtil -lpthread
LIBS = -lIce $(BASELIBS)
diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX
index 180eabbdcfc..07540472802 100644
--- a/cpp/config/Make.rules.HP-UX
+++ b/cpp/config/Make.rules.HP-UX
@@ -45,8 +45,8 @@ endif
#
CXXLIBS = -lCsup_v2 -lstd_v2
-ifeq ($(ADD_LIBDIR_TO_RPATH),yes)
- LDPLATFORMFLAGS = -Wl,+s -Wl,+b$(install_libdir)
+ifneq ($(embedded_runpath_prefix),)
+ LDPLATFORMFLAGS = -Wl,+s -Wl,+b$(runpath_libdir)
else
LDPLATFORMFLAGS = -Wl,+s
endif
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index bab0d07e767..9d41f2e1f9d 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -80,7 +80,7 @@ ifeq ($(CXX),c++)
ifeq ($(OPTIMIZE),yes)
CXXFLAGS += -O3 -DNDEBUG
else
- CXXFLAGS += -g
+ CXXFLAGS += -g
endif
ifeq ($(USE_SPARC_ASM),yes)
@@ -107,8 +107,8 @@ ifeq ($(CXX),c++)
rpathlink = -Wl,-rpath-link,$(1)
- ifeq ($(ADD_LIBDIR_TO_RPATH),yes)
- LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,$(install_libdir)
+ ifneq ($(embedded_runpath_prefix),)
+ LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,$(runpath_libdir)
else
LDPLATFORMFLAGS = -Wl,--enable-new-dtags
endif
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index 6a27390cd53..4f041efcb43 100644
--- a/cpp/config/Make.rules.SunOS
+++ b/cpp/config/Make.rules.SunOS
@@ -100,8 +100,8 @@ ifeq ($(CXX),CC)
mklib = $(CXX) -xar -o $(1) $(2)
- ifeq ($(ADD_LIBDIR_TO_RPATH),yes)
- LDPLATFORMFLAGS = -R $(install_libdir) -z text
+ ifneq ($(embedded_runpath_prefix),)
+ LDPLATFORMFLAGS = -R $(runpath_libdir) -z text
else
LDPLATFORMFLAGS = -z text
endif
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 10:39:35 +0000