From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harald Hoyer Date: Tue, 08 Jul 2008 06:53:51 +0000 Subject: Re: [PATCH 2/2] Fixed installation path for 64-bit libvolume_id.so Message-Id: <48730EFF.6040309@redhat.com> MIME-Version: 1 Content-Type: multipart/mixed; boundary="------------ms080602090906010501070206" List-Id: References: <1215468723-18298-2-git-send-email-thomas@koeller.dyndns.org> In-Reply-To: <1215468723-18298-2-git-send-email-thomas@koeller.dyndns.org> To: linux-hotplug@vger.kernel.org This is a cryptographically signed message in MIME format. --------------ms080602090906010501070206 Content-Type: multipart/mixed; boundary="------------060005050307040909040503" This is a multi-part message in MIME format. --------------060005050307040909040503 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Thomas Koeller wrote: > Installing 64-bit libraries in /lib and /usr/lib > is wrong. > Fedora has the attached patch and builds on 64bit systems with: $ make libdir="/lib64" usrlibdir="/usr/lib64" ... --------------060005050307040909040503 Content-Type: text/plain; name="udev-091-lib64.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="udev-091-lib64.patch" diff -up udev-120/extras/volume_id/lib/Makefile.lib64 udev-120/extras/volume_id/lib/Makefile --- udev-120/extras/volume_id/lib/Makefile.lib64 2008-04-04 14:13:33.000000000 +0200 +++ udev-120/extras/volume_id/lib/Makefile 2008-04-04 14:15:05.000000000 +0200 @@ -4,9 +4,9 @@ # # Released under the GNU General Public License, version 2. # -includedir = ${prefix}/usr/include -libdir = ${prefix}/lib -usrlibdir = ${prefix}/usr/lib +includedir ?= ${prefix}/usr/include +libdir ?= ${prefix}/lib +usrlibdir ?= ${prefix}/usr/lib INSTALL = install -c INSTALL_DATA = ${INSTALL} -m 644 @@ -115,6 +115,7 @@ ifeq ($(libdir),$(usrlibdir)) else ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so endif + $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc .PHONY: install diff -up udev-120/extras/volume_id/Makefile.lib64 udev-120/extras/volume_id/Makefile --- udev-120/extras/volume_id/Makefile.lib64 2008-04-03 21:12:53.000000000 +0200 +++ udev-120/extras/volume_id/Makefile 2008-04-04 14:13:33.000000000 +0200 @@ -17,6 +17,9 @@ usrsbindir = ${prefix}/usr/sbin libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ +libdir ?= ${prefix}/lib +usrlibdir ?= ${prefix}/usr/lib + INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} @@ -34,7 +37,11 @@ all: lib $(PROG) $(MAN_PAGES) $(Q) $(CC) -c $(CFLAGS) $< -o $@ lib: - $(Q) $(MAKE) -C $@ + $(Q) $(MAKE) \ + libdir=$(libdir) \ + usrlibdir=$(usrlibdir) \ + -C lib +# $(Q) $(MAKE) -C $@ .PHONY: lib lib/libvolume_id.a: lib diff -up udev-120/Makefile.lib64 udev-120/Makefile --- udev-120/Makefile.lib64 2008-04-03 21:12:53.000000000 +0200 +++ udev-120/Makefile 2008-04-04 14:13:33.000000000 +0200 @@ -91,6 +91,8 @@ usrbindir = ${prefix}/usr/bin libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev +libdir ?= ${prefix}/lib +usrlibdir ?= ${prefix}/usr/lib udevdir = /dev DESTDIR = @@ -161,6 +163,8 @@ all: $(PROGRAMS) $(MAN_PAGES) RANLIB="$(RANLIB)" \ LIB_OBJS="$(LIB_OBJS)" \ LIBUDEV="$(PWD)/$(LIBUDEV)" \ + libdir=$(libdir) \ + usrlibdir=$(usrlibdir) \ -C $$target $@ || exit 1; \ done; .PHONY: all --------------060005050307040909040503-- --------------ms080602090906010501070206 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIKYjCC BS0wggMVoAMCAQICAwOoWjANBgkqhkiG9w0BAQUFADB5MRAwDgYDVQQKEwdSb290IENBMR4w HAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZzAeFw0wNzA2 MDYwNjQ5MDNaFw0wOTA2MDUwNjQ5MDNaMDkxFTATBgNVBAMTDEhhcmFsZCBIb3llcjEgMB4G CSqGSIb3DQEJARYRaGFyYWxkQHJlZGhhdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw ggEKAoIBAQDcYRNZNcpUzmHaTtZXCPoLNJW7g0iD9Oo8BgGQDmLQPEIw05SINqk5f+YvIvoo a85lze7+bfhDg3MJmcTu5C8OKnej+GfZV8qVnLLg0F1d2pSc1oKTarasUN+BSNTn8mc+BlKM jEF5I4faGGATEgM/1pkscRofiQoWDvMAHsD/UVErVTKzLT03vczQutUYfHJuGJohXdJubQdJ C2AyXqLJBkvns+0pNGB7qMHTVPWm9+v1I18iz0sXe5hOsTMIJFFCkia41ZVpGkwU/9ITVLtY E+UmW897Tpi4uUE5YsPVoA3u5YIFlQFkwW1Zp9bAlmFGNlUUe2UEvpTAWWVte+qBAgMBAAGj gf0wgfowDAYDVR0TAQH/BAIwADBWBglghkgBhvhCAQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNl cnRpZmljYXRlIGZvciBGUkVFIGhlYWQgb3ZlciB0byBodHRwOi8vd3d3LkNBY2VydC5vcmcw QAYDVR0lBDkwNwYIKwYBBQUHAwQGCCsGAQUFBwMCBgorBgEEAYI3CgMEBgorBgEEAYI3CgMD BglghkgBhvhCBAEwMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vb2NzcC5j YWNlcnQub3JnMBwGA1UdEQQVMBOBEWhhcmFsZEByZWRoYXQuY29tMA0GCSqGSIb3DQEBBQUA A4ICAQAyKBirdOIjYdzfQAhpme6t2gg/cAzxITk4Vq+DpoxSJ8JD8f6mlQoMblC9zCFAWk7X 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 FWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhv cml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9ydEBjYWNlcnQub3JnAgMDqFowCQYFKw4DAhoF AKCCAegwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDgwNzA4 MDY1MzUxWjAjBgkqhkiG9w0BCQQxFgQU4nqSmt5zLAyn1KJwC2yrI3tKZuwwXwYJKoZIhvcN AQkPMVIwUDALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqG SIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGRBgkrBgEEAYI3EAQxgYMwgYAw eTEQMA4GA1UEChMHUm9vdCBDQTEeMBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIw IAYDVQQDExlDQSBDZXJ0IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBw b3J0QGNhY2VydC5vcmcCAwOoWjCBkwYLKoZIhvcNAQkQAgsxgYOggYAweTEQMA4GA1UEChMH Um9vdCBDQTEeMBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBD ZXJ0IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2VydC5v cmcCAwOoWjANBgkqhkiG9w0BAQEFAASCAQAO2I5uHKs2JTjV7VXIgmMrt+iXnA0SMop9Q4Pw y/us35Qz2MqccoXOQF6oW1ndfWjgsOrvvb4wYYorAzQTXof0MQqQx11BnauzckzrE2tkI/Yb j3KrQuzg36pbilUgVd9C2ISMfWSkY/ktfkNzv7BmASfLBuAmU6D0GWYwisdhjFrA6M5lu468 ruTA4rwNf1KVxB31DV2UgWS9fdz3PXH6AAxe+2WjcAHA8bUc+ROTrf/C2xIOxiw3aVaypgIo T+d46bR4EEo5kYiy+c5VYGpZwuEo0HLHOupn+Znx7okCU4pAqhWtwPAFhxd10xr5odJ+Ld7B IMOBq3kGZp1y/gD0AAAAAAAA --------------ms080602090906010501070206--