0003-Remove-hardcoded-arch-variable.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From 7424f2bea0cb412e96202f596ad8077131589f40 Mon Sep 17 00:00:00 2001
  2. From: Adam Duskett <Aduskett@gmail.com>
  3. Date: Thu, 14 Jul 2016 13:18:24 -0400
  4. Subject: [PATCH] Remove hardcoded arch variable.
  5. Allow the ARCH value to be passed in as original configuration was
  6. solely based on host architecture.
  7. This patch was updated to work with version 2.5
  8. Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
  9. Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
  10. Signed-off-by: Adam Duskett <AdamDuskett@outlook.com>
  11. Signed-off-by: Adam Duskett <Aduskett@gmail.com>
  12. ---
  13. policycoreutils/mcstrans/src/Makefile | 1 -
  14. policycoreutils/mcstrans/utils/Makefile | 1 -
  15. 2 files changed, 2 deletions(-)
  16. diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile
  17. index 6fda57e..7b4489f 100644
  18. --- a/mcstrans/src/Makefile
  19. +++ b/mcstrans/src/Makefile
  20. @@ -1,4 +1,3 @@
  21. -ARCH = $(shell uname -i)
  22. # Installation directories.
  23. PREFIX ?= $(DESTDIR)/usr
  24. SBINDIR ?= $(DESTDIR)/sbin
  25. diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile
  26. index 1ffb027..912fe12 100644
  27. --- a/mcstrans/utils/Makefile
  28. +++ b/mcstrans/utils/Makefile
  29. @@ -2,7 +2,6 @@
  30. PREFIX ?= $(DESTDIR)/usr
  31. BINDIR ?= $(PREFIX)/sbin
  32. -ARCH = $(shell uname -i)
  33. ifeq "$(ARCH)" "x86_64"
  34. # In case of 64 bit system, use these lines
  35. LIBDIR=/usr/lib64
  36. --
  37. 2.7.4