From 994b8936030407d20a8839b1551d58d98bb128d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 15 Mar 2006 00:51:03 +0000 Subject: [PATCH] Fix PIC handling on AMD64 systems when PIE is enabled, bug #122437. Many thanks to Chris White for helping testing. Package-Manager: portage-2.1_pre6-r2 --- media-tv/tvtime/ChangeLog | 6 +++++- media-tv/tvtime/Manifest | 22 ++++++++++++++++------ media-tv/tvtime/files/tvtime-pic.patch | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog index 8aa705239479..1ab298c93c12 100644 --- a/media-tv/tvtime/ChangeLog +++ b/media-tv/tvtime/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/tvtime # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.24 2006/02/07 20:44:37 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.25 2006/03/15 00:51:03 flameeyes Exp $ + + 15 Mar 2006; Diego Pettenò files/tvtime-pic.patch: + Fix PIC handling on AMD64 systems when PIE is enabled, bug #122437. Many + thanks to Chris White for helping testing. 07 Feb 2006; Simon Stelling tvtime-0.9.15.ebuild: stable on amd64 diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest index c794dfa1477e..f82cb92f905d 100644 --- a/media-tv/tvtime/Manifest +++ b/media-tv/tvtime/Manifest @@ -1,6 +1,9 @@ -MD5 6f4647019f03f121aca2619c6abc19aa ChangeLog 4998 -RMD160 98ca74caf176c395c32c070cb65ed7062588d436 ChangeLog 4998 -SHA256 cb4e06d29d0cc3bdc65325d501358f4ff52efb3a5dd7eed970f99c4876719c32 ChangeLog 4998 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 41387721920f53eb1d8d8ad7a0e697f4 ChangeLog 5200 +RMD160 72fcd19cdb5d8a25948907ea97f6289fa63ab5a9 ChangeLog 5200 +SHA256 dbe2de2c90fe504cfed4327a310fe26f756a14c39f6e5b950f98f0726427130b ChangeLog 5200 MD5 352d39fb5ee53bdb9ea901579c0d7b9d files/digest-tvtime-0.9.12 66 RMD160 5d68165f6ccc4d96d2833c15c3d971b19f59c976 files/digest-tvtime-0.9.12 66 SHA256 7deb6a15c96ac6432a9ff12f276a6e7a71feaf657bf8f1dbcaceb6b1c9879825 files/digest-tvtime-0.9.12 66 @@ -22,9 +25,9 @@ SHA256 50a4162ab9e1587b8d61633c6c168664da538853e6ee688bdf9b8c7e3baeb443 files/tv MD5 c782789825dfa664e1f6fcc96ac7246c files/tvtime-1.0.2-gcc41.patch 2114 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a9 files/tvtime-1.0.2-gcc41.patch 2114 SHA256 5272246501f80135ba11fdbe15e345e430bade41c552cfdef696d10396a7cdfd files/tvtime-1.0.2-gcc41.patch 2114 -MD5 ee506c523f1880bb929e7e5f25d4fe6b files/tvtime-pic.patch 248 -RMD160 504ac7c6fc047cec86da6c826fd01841594bdc76 files/tvtime-pic.patch 248 -SHA256 1419f4823d62057f2ad05533ea80196f7f9475fcdab721638c7656da5560a34e files/tvtime-pic.patch 248 +MD5 4bc08a98c7cc134accb89aea3018c2f6 files/tvtime-pic.patch 254 +RMD160 31f3fb8937ae15c28ade1f55a1a6947bf31766cf files/tvtime-pic.patch 254 +SHA256 db033fc267bf72034f49705680ced9d086b413efc9f947bd94b4e9117f808d41 files/tvtime-pic.patch 254 MD5 d19bb57e494a860d7ed0aaa7961d8406 metadata.xml 247 RMD160 227cc8b2f3b561961fec2443bda9112fda44eb4c metadata.xml 247 SHA256 75a801512f14243e73a8c0d98ea2297c0382a898f0fbacf30d7ccb2baad31e3b metadata.xml 247 @@ -43,3 +46,10 @@ SHA256 43c45bd94718145fd0e2e84f0719c24a3f02efb21db2ad706773ed9f6008e2b2 tvtime-1 MD5 61f0b883016265880a71112c1cb61697 tvtime-1.0.2.ebuild 1665 RMD160 c7fcdf74e342bfff686877a596d8f504bcee450c tvtime-1.0.2.ebuild 1665 SHA256 4be809782b078162cb5b4a36835a0c7f9e6d57b7d3d3d6bed37d079e45cbed36 tvtime-1.0.2.ebuild 1665 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.2 (GNU/Linux) + +iD8DBQFEF2UEAiZjviIA2XgRAteJAKDOFbUWvDoXHV281xDXMtt0DZNTqgCgmTXj +DRlObC9f9k8qK3ZTEe25qnY= +=M25b +-----END PGP SIGNATURE----- diff --git a/media-tv/tvtime/files/tvtime-pic.patch b/media-tv/tvtime/files/tvtime-pic.patch index ec3779a87bbf..00b040e60af9 100644 --- a/media-tv/tvtime/files/tvtime-pic.patch +++ b/media-tv/tvtime/files/tvtime-pic.patch @@ -5,7 +5,7 @@ uint32_t caps; -#ifndef PIC -+#if !defined(PIC) && !defined(__PIC__) ++#if !defined(__PIC__) || defined(__x86_64__) #define cpuid(op,eax,ebx,ecx,edx) \ __asm__ ("cpuid" \ : "=a" (eax), \ -- 2.26.2