diff options
| -rw-r--r-- | sys-cluster/vzctl/Manifest | 24 | ||||
| -rw-r--r-- | sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch | 17 | ||||
| -rw-r--r-- | sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch | 17 | ||||
| -rw-r--r-- | sys-cluster/vzctl/vzctl-3.0.12.ebuild | 7 |
4 files changed, 42 insertions, 23 deletions
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest index 6ce0ed6..1bf986a 100644 --- a/sys-cluster/vzctl/Manifest +++ b/sys-cluster/vzctl/Manifest @@ -1,16 +1,16 @@ -AUX vzctl-3.0.12-libdir.patch 366 RMD160 a6a683b36ab41bf22e6a1e397126862d1bcf08c8 SHA1 1fdea9d195ed88029a561ab18431fe3feec05a26 SHA256 16e0cfdda4047f91705b8b513d5438097cd9674d487bcb08d4dd396c8088ae8a -MD5 aaffe1a4f6480eb84f8d5feacf7c4ffe files/vzctl-3.0.12-libdir.patch 366 -RMD160 a6a683b36ab41bf22e6a1e397126862d1bcf08c8 files/vzctl-3.0.12-libdir.patch 366 -SHA256 16e0cfdda4047f91705b8b513d5438097cd9674d487bcb08d4dd396c8088ae8a files/vzctl-3.0.12-libdir.patch 366 -AUX vzctl-3.0.12-libdir64.patch 368 RMD160 8d7e4723590b4a60c0b189bcc1d51f228ee22e23 SHA1 8b1cd2b03d3700180c4b02cdbbd11a6db5f84b20 SHA256 22d680fa017be5337333f11d907ea21b7a5ab18fabfa96519b17692111d1ba4b -MD5 666fa7c36c9e7f8ac70c59cf94d097cf files/vzctl-3.0.12-libdir64.patch 368 -RMD160 8d7e4723590b4a60c0b189bcc1d51f228ee22e23 files/vzctl-3.0.12-libdir64.patch 368 -SHA256 22d680fa017be5337333f11d907ea21b7a5ab18fabfa96519b17692111d1ba4b files/vzctl-3.0.12-libdir64.patch 368 +AUX vzctl-3.0.12-libdir.patch 794 RMD160 42854a7bec42a491f19d5e544d782c9ac462980c SHA1 e6104bbf18c2593808e4e4733d0d2e1459298dd0 SHA256 32ad74a238e7360c000ce7b37e6b73b3329a722323044fff5d5fb77d08260b34 +MD5 5f54e21eecca823c48cc0c5719d1b381 files/vzctl-3.0.12-libdir.patch 794 +RMD160 42854a7bec42a491f19d5e544d782c9ac462980c files/vzctl-3.0.12-libdir.patch 794 +SHA256 32ad74a238e7360c000ce7b37e6b73b3329a722323044fff5d5fb77d08260b34 files/vzctl-3.0.12-libdir.patch 794 +AUX vzctl-3.0.12-libdir64.patch 796 RMD160 b9dc4815d4569bb51f16f448c63653126d47e821 SHA1 176f62318d6b92cf0762f1cc585e2bf111aefea3 SHA256 1757f29afc922075b07f20f2032323b7614f60ffe676638dc4c3aba629649a86 +MD5 d31c11cde21036ed55b4242662e19786 files/vzctl-3.0.12-libdir64.patch 796 +RMD160 b9dc4815d4569bb51f16f448c63653126d47e821 files/vzctl-3.0.12-libdir64.patch 796 +SHA256 1757f29afc922075b07f20f2032323b7614f60ffe676638dc4c3aba629649a86 files/vzctl-3.0.12-libdir64.patch 796 DIST vzctl-3.0.12.tar.bz2 124775 RMD160 f98fdc5c6ed9a33e182e0282560bb1affc4f6125 SHA1 e09dcf7009a3715785cf150d5810b25123bb5015 SHA256 b319eda426a1bfdcd5d6f389ac153986d844efeaf7e83c9af3576411058e842d -EBUILD vzctl-3.0.12.ebuild 2193 RMD160 c18ad46a501599928766d2e20b63944e41b39c23 SHA1 46b6e489321f047267c631516bef47d79ef3bdba SHA256 62ade2040e509ac01d2220a62dc6d8b7f5d8944f33900f4c08168c46b66408f4 -MD5 b3ac4d53dff94e654a69d54cc87026ed vzctl-3.0.12.ebuild 2193 -RMD160 c18ad46a501599928766d2e20b63944e41b39c23 vzctl-3.0.12.ebuild 2193 -SHA256 62ade2040e509ac01d2220a62dc6d8b7f5d8944f33900f4c08168c46b66408f4 vzctl-3.0.12.ebuild 2193 +EBUILD vzctl-3.0.12.ebuild 2254 RMD160 1266986d5a0ca4f209bf6180566444fa0424e285 SHA1 267573b85a102ef5439ff7ae155e994c4567ce4a SHA256 2ce25eddc47626834c1022e906b5a92716e15d74107a6611a5b4a85e91b633d0 +MD5 b95578e43fa635ead241afae13ba1eb9 vzctl-3.0.12.ebuild 2254 +RMD160 1266986d5a0ca4f209bf6180566444fa0424e285 vzctl-3.0.12.ebuild 2254 +SHA256 2ce25eddc47626834c1022e906b5a92716e15d74107a6611a5b4a85e91b633d0 vzctl-3.0.12.ebuild 2254 MD5 22e28b31f4ee293763d4ef50cc69da3f files/digest-vzctl-3.0.12 241 RMD160 f7cd3ed3af7fcf41ba414930431b9c77fb7d769b files/digest-vzctl-3.0.12 241 SHA256 97696e9bc738122573c3fe1b843787764b11131c09dda786d3d4a20b1e62c3a2 files/digest-vzctl-3.0.12 241 diff --git a/sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch index cea7296..972bcec 100644 --- a/sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch +++ b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch @@ -1,7 +1,7 @@ -diff --git a/src/Makefile b/src/Makefile -index a8be2d2..85397da 100644 ---- a/src/Makefile -+++ b/src/Makefile +diff --git vzctl-3.0.12.orig/src/Makefile vzctl-3.0.12/src/Makefile +index a8be2d2..36a9bff 100644 +--- vzctl-3.0.12.orig/src/Makefile ++++ vzctl-3.0.12/src/Makefile @@ -17,7 +17,7 @@ # INSTALL = install PREFIX = /usr @@ -11,3 +11,12 @@ index a8be2d2..85397da 100644 CONFDIR = /etc/vz GLBCONFIG = $(CONFDIR)/vz.conf VPSCONFDIR = $(CONFDIR)/conf +@@ -110,7 +110,7 @@ libvzctl.a: $(OBJ_libvzctl) $(OBJ_simfs) + ranlib $@ + + $(LIB_vzctl) : $(OBJ_simfs) $(OBJ_libvzctl) +- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) -shared -o $@ ++ $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) -shared --Wl,-soname,$@ -o $@ + + vzctl-static: $(OBJ_vzctl) libvzctl.a + $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -rdynamic -ldl -lutil -o $@ diff --git a/sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch index a717a15..e4234b6 100644 --- a/sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch +++ b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch @@ -1,7 +1,7 @@ -diff --git a/src/Makefile b/src/Makefile -index a8be2d2..85397da 100644 ---- a/src/Makefile -+++ b/src/Makefile +diff --git vzctl-3.0.12.orig/src/Makefile vzctl-3.0.12/src/Makefile +index a8be2d2..36a9bff 100644 +--- vzctl-3.0.12.orig/src/Makefile ++++ vzctl-3.0.12/src/Makefile @@ -17,7 +17,7 @@ # INSTALL = install PREFIX = /usr @@ -11,3 +11,12 @@ index a8be2d2..85397da 100644 CONFDIR = /etc/vz GLBCONFIG = $(CONFDIR)/vz.conf VPSCONFDIR = $(CONFDIR)/conf +@@ -110,7 +110,7 @@ libvzctl.a: $(OBJ_libvzctl) $(OBJ_simfs) + ranlib $@ + + $(LIB_vzctl) : $(OBJ_simfs) $(OBJ_libvzctl) +- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) -shared -o $@ ++ $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) -shared --Wl,-soname,$@ -o $@ + + vzctl-static: $(OBJ_vzctl) libvzctl.a + $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -rdynamic -ldl -lutil -o $@ diff --git a/sys-cluster/vzctl/vzctl-3.0.12.ebuild b/sys-cluster/vzctl/vzctl-3.0.12.ebuild index 22642a8..f633f98 100644 --- a/sys-cluster/vzctl/vzctl-3.0.12.ebuild +++ b/sys-cluster/vzctl/vzctl-3.0.12.ebuild @@ -38,12 +38,13 @@ src_compile() { } src_install() { - make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed" +# make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed" + make DESTDIR="${D}" install || die "make install failed" # the get_libdir in `make install' breaks src/Makefile's logic (and thus all # contained tools), so we have to create a env.d entry for vzctl's LDPATH. - dodir /etc/env.d - echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl + #dodir /etc/env.d + #echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl # setup udev rules for /dev/vzctl if use udev; then |