| 1 |
commit: b384321d7faa0dcca51755ed6dbbf634449a34a3 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 17 17:10:25 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 17 17:12:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b384321d |
| 7 |
|
| 8 |
app-crypt/bestcrypt: cleanup old |
| 9 |
|
| 10 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
app-crypt/bestcrypt/Manifest | 1 - |
| 14 |
app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild | 78 ----- |
| 15 |
.../bestcrypt/files/bestcrypt-2.0.6-build.patch | 341 --------------------- |
| 16 |
3 files changed, 420 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest |
| 19 |
index 13c146edd3a..87ebb416467 100644 |
| 20 |
--- a/app-crypt/bestcrypt/Manifest |
| 21 |
+++ b/app-crypt/bestcrypt/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
-DIST BestCrypt-2.0.11.tar.gz 2191182 BLAKE2B 5fe6d18b0c89273491fbcdb9bf7c73332342fca77cdf457c83f106f5cca693532eea6668e04f7c93828b3d5dc4419872066eda22fb10c780a838ddd78cf79255 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2 |
| 24 |
DIST BestCrypt-2.0.14.tar.gz 2211286 BLAKE2B 1ff777a72528ec22ca168492c335ec54be924b653323670619049cc9dfbcd144c28702bf857517c5189c937f3712e749c47ef14006a8883c63419b866b8f48f9 SHA512 1e542f00886413f1519ca5667bb297cce25a46fb5ec90a7e1a61934df3cd34e0d680f32e0b111727865459ef7d89d2761b379b4a557ada6d7ee3e47e32bf762c |
| 25 |
|
| 26 |
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild |
| 27 |
deleted file mode 100644 |
| 28 |
index 86e153ad106..00000000000 |
| 29 |
--- a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,78 +0,0 @@ |
| 32 |
-# Copyright 1999-2018 Gentoo Foundation |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
- |
| 35 |
-EAPI="6" |
| 36 |
- |
| 37 |
-inherit linux-mod toolchain-funcs versionator |
| 38 |
- |
| 39 |
-MY_PN="BestCrypt" |
| 40 |
-DESCRIPTION="commercially licensed transparent filesystem encryption" |
| 41 |
-HOMEPAGE="http://www.jetico.com/" |
| 42 |
-SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz" |
| 43 |
- |
| 44 |
-LICENSE="bestcrypt" |
| 45 |
-SLOT="0" |
| 46 |
-IUSE="" |
| 47 |
-KEYWORDS="~amd64 ~x86" |
| 48 |
- |
| 49 |
-DEPEND="virtual/linux-sources |
| 50 |
- app-shells/bash" |
| 51 |
-RDEPEND="" |
| 52 |
- |
| 53 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
| 54 |
- |
| 55 |
-DOCS=( |
| 56 |
- HIDDEN_PART README |
| 57 |
-) |
| 58 |
- |
| 59 |
-PATCHES=( |
| 60 |
- "${FILESDIR}/${PN}-2.0.6-build.patch" |
| 61 |
-) |
| 62 |
- |
| 63 |
-pkg_setup() { |
| 64 |
- CONFIG_CHECK="MODULES" |
| 65 |
- linux-mod_pkg_setup |
| 66 |
- |
| 67 |
- MODULE_NAMES="bestcrypt(block::kernel/kmod) |
| 68 |
- bc_3des(crypto::kernel/kmod/crypto/algs/3des) |
| 69 |
- bc_bf128(crypto::kernel/kmod/crypto/algs/bf128) |
| 70 |
- bc_bf448(crypto::kernel/kmod/crypto/algs/bf448) |
| 71 |
- bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish) |
| 72 |
- bc_cast(crypto::kernel/kmod/crypto/algs/cast) |
| 73 |
- bc_des(crypto::kernel/kmod/crypto/algs/des) |
| 74 |
- bc_gost(crypto::kernel/kmod/crypto/algs/gost) |
| 75 |
- bc_idea(crypto::kernel/kmod/crypto/algs/idea) |
| 76 |
- bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)" |
| 77 |
- BUILD_TARGETS="module" |
| 78 |
- BUILD_PARAMS=" \ |
| 79 |
- BC_KERNEL_DIR=\"${KERNEL_DIR}\"" |
| 80 |
-} |
| 81 |
- |
| 82 |
-src_compile() { |
| 83 |
- MAKEOPTS="-j1" linux-mod_src_compile \ |
| 84 |
- CXX="$(tc-getCXX)" |
| 85 |
- MAKEOPTS="-j1" emake \ |
| 86 |
- CC="$(tc-getCC)" \ |
| 87 |
- CXX="$(tc-getCXX)" \ |
| 88 |
- AR="$(tc-getAR)" \ |
| 89 |
- CFLAGS="${CXXFLAGS}" \ |
| 90 |
- LDFLAGS="${LDFLAGS}" |
| 91 |
-} |
| 92 |
- |
| 93 |
-src_install() { |
| 94 |
- linux-mod_src_install |
| 95 |
- |
| 96 |
- emake install PREFIX="${ED}" install |
| 97 |
- |
| 98 |
- newinitd "${FILESDIR}/bcrypt3" bcrypt |
| 99 |
- sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt" |
| 100 |
-} |
| 101 |
- |
| 102 |
-pkg_postinst() { |
| 103 |
- ewarn |
| 104 |
- ewarn "The BestCrypt drivers are not free - Please purchace a license from " |
| 105 |
- ewarn "http://www.jetico.com/" |
| 106 |
- ewarn |
| 107 |
- |
| 108 |
- linux-mod_pkg_postinst |
| 109 |
-} |
| 110 |
|
| 111 |
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch |
| 112 |
deleted file mode 100644 |
| 113 |
index 966053072d3..00000000000 |
| 114 |
--- a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,341 +0,0 @@ |
| 117 |
-From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001 |
| 118 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 119 |
-Date: Sun, 6 Jul 2014 21:34:21 +0300 |
| 120 |
-Subject: [PATCH 3/3] build: do not auto build/install module |
| 121 |
- |
| 122 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 123 |
---- |
| 124 |
- Makefile | 4 ++-- |
| 125 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 126 |
- |
| 127 |
-diff --git a/Makefile b/Makefile |
| 128 |
-index 3cd36fd..a3fd59e 100644 |
| 129 |
---- a/Makefile |
| 130 |
-+++ b/Makefile |
| 131 |
-@@ -98,5 +98,5 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests |
| 132 |
- |
| 133 |
- # default target builds console tool with modules |
| 134 |
--all: Makefile helpers module console |
| 135 |
-+all: Makefile helpers console |
| 136 |
- true |
| 137 |
- |
| 138 |
-@@ -226,5 +226,5 @@ module-clean: force-look |
| 139 |
- |
| 140 |
- # install for default target |
| 141 |
--install: module-install console-install helpers-install |
| 142 |
-+install: console-install helpers-install |
| 143 |
- true |
| 144 |
- |
| 145 |
--- |
| 146 |
-1.8.5.5 |
| 147 |
- |
| 148 |
-From f7f71ec155385aea3dec495d46d07452943fe729 Mon Sep 17 00:00:00 2001 |
| 149 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 150 |
-Date: Tue, 17 Mar 2015 21:05:22 +0200 |
| 151 |
-Subject: [PATCH] build: allow override programs |
| 152 |
- |
| 153 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 154 |
---- |
| 155 |
- Makefile | 11 +++++++---- |
| 156 |
- certificate/CertificateLib/Makefile | 4 +++- |
| 157 |
- disk/Makefile | 6 ++++-- |
| 158 |
- fslib/Makefile | 16 +++++++++------- |
| 159 |
- kernel/Makefile | 5 +++-- |
| 160 |
- keygens/kgghost/Makefile | 7 +++++-- |
| 161 |
- keygens/kgsha/Makefile | 7 +++++-- |
| 162 |
- mount/Makefile | 9 +++++---- |
| 163 |
- spacemap/Makefile | 6 ++++-- |
| 164 |
- tests/Makefile | 12 ++++++------ |
| 165 |
- 10 files changed, 51 insertions(+), 32 deletions(-) |
| 166 |
- |
| 167 |
-diff --git a/Makefile b/Makefile |
| 168 |
-index 6af2319..359d022 100644 |
| 169 |
---- a/Makefile |
| 170 |
-+++ b/Makefile |
| 171 |
-@@ -56,6 +56,9 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a |
| 172 |
- KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a |
| 173 |
- SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a |
| 174 |
- |
| 175 |
-+CC = gcc |
| 176 |
-+CXX = g++ |
| 177 |
-+ |
| 178 |
- BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 179 |
- BC_EXTRA_LDFLAGS = $(LDFLAGS) |
| 180 |
- |
| 181 |
-@@ -125,7 +128,7 @@ helpers: create-dirs |
| 182 |
- console: spacemap-lib certificate-lib fs-lib kernel-lib keygen-libs $(TARGET) |
| 183 |
- true |
| 184 |
- $(TARGET): $(BCTOOL_OBJS) |
| 185 |
-- g++ $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET) |
| 186 |
-+ $(CXX) $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET) |
| 187 |
- |
| 188 |
- # GUI executable only (w/o console and helpers) |
| 189 |
- panel: certificate-lib kernel-lib keygen-libs fs-lib |
| 190 |
-@@ -339,10 +342,10 @@ module-uninstall: |
| 191 |
- bash ./scripts/remove_mods |
| 192 |
- |
| 193 |
- %.o:%.cpp |
| 194 |
-- g++ -c $(BCTOOL_CFLAGS) $< -o $@ |
| 195 |
-+ $(CXX) -c $(BCTOOL_CFLAGS) $< -o $@ |
| 196 |
- |
| 197 |
- %.o:%.cc |
| 198 |
-- g++ -c $(BCTOOL_CFLAGS) $< -o $@ |
| 199 |
-+ $(CXX) -c $(BCTOOL_CFLAGS) $< -o $@ |
| 200 |
- |
| 201 |
- %.o:%.c |
| 202 |
-- gcc -c $(BCTOOL_CFLAGS) $< -o $@ |
| 203 |
-+ $(CC) -c $(BCTOOL_CFLAGS) $< -o $@ |
| 204 |
-diff --git a/certificate/CertificateLib/Makefile b/certificate/CertificateLib/Makefile |
| 205 |
-index d28ccc7..810a30a 100644 |
| 206 |
---- a/certificate/CertificateLib/Makefile |
| 207 |
-+++ b/certificate/CertificateLib/Makefile |
| 208 |
-@@ -1,5 +1,7 @@ |
| 209 |
- |
| 210 |
--CP = cp |
| 211 |
-+CC = gcc |
| 212 |
-+CXX = g++ |
| 213 |
-+AR = ar |
| 214 |
- CFLAGS += -Wall -fno-strict-aliasing -O3 |
| 215 |
- #-Werror |
| 216 |
- |
| 217 |
-diff --git a/disk/Makefile b/disk/Makefile |
| 218 |
-index e3915b0..1a9ff01 100644 |
| 219 |
---- a/disk/Makefile |
| 220 |
-+++ b/disk/Makefile |
| 221 |
-@@ -1,14 +1,16 @@ |
| 222 |
- DISKMON_OBJS = disk.o diskmon.o |
| 223 |
-+ |
| 224 |
-+CXX = g++ |
| 225 |
- CFLAGS += -Wall -I. -I../ -p -gdwarf-2 #-DBC_DEBUG |
| 226 |
- LDFLAGS += -ludev |
| 227 |
- |
| 228 |
- all:diskmon Makefile |
| 229 |
- |
| 230 |
- diskmon:$(DISKMON_OBJS) |
| 231 |
-- g++ $(DISKMON_OBJS) $(LDFLAGS) -o diskmon |
| 232 |
-+ $(CXX) $(DISKMON_OBJS) $(LDFLAGS) -o diskmon |
| 233 |
- |
| 234 |
- %.o:%.cc |
| 235 |
-- g++ $(CFLAGS) -c $< -o $@ |
| 236 |
-+ $(CXX) $(CFLAGS) -c $< -o $@ |
| 237 |
- |
| 238 |
- clean: |
| 239 |
- rm -rf diskmon *.o |
| 240 |
-diff --git a/fslib/Makefile b/fslib/Makefile |
| 241 |
-index a6f96f4..bbe6cae 100644 |
| 242 |
---- a/fslib/Makefile |
| 243 |
-+++ b/fslib/Makefile |
| 244 |
-@@ -1,3 +1,5 @@ |
| 245 |
-+CC = gcc |
| 246 |
-+AR = ar |
| 247 |
- |
| 248 |
- FSLIB_CFLAGS = $(CFLAGS) -Wall -O0 -DFSLIB_DEBUG -g # -O3 |
| 249 |
- FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden |
| 250 |
-@@ -15,25 +17,25 @@ FSLIB_TOOLS = file_hfs test_hfs test_info test_free_space diskinfo |
| 251 |
- all: Makefile $(FSLIB) $(FSLIB_TOOLS) |
| 252 |
- |
| 253 |
- $(FSLIB): $(OBJS) |
| 254 |
-- ar rcs $(FSLIB) $(OBJS) |
| 255 |
-+ $(AR) rcs $(FSLIB) $(OBJS) |
| 256 |
- |
| 257 |
- test_hfs: $(FSLIB) test/test_hfs.o |
| 258 |
-- gcc test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs |
| 259 |
-+ $(CC) test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs |
| 260 |
- |
| 261 |
- file_hfs: $(FSLIB) test/file_hfs.o |
| 262 |
-- gcc test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs |
| 263 |
-+ $(CC) test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs |
| 264 |
- |
| 265 |
- test_info: $(FSLIB) test/test_info.o |
| 266 |
-- gcc test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info |
| 267 |
-+ $(CC) test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info |
| 268 |
- |
| 269 |
- test_free_space: $(FSLIB) test/test_free_space.o |
| 270 |
-- gcc test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space |
| 271 |
-+ $(CC) test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space |
| 272 |
- |
| 273 |
- diskinfo: $(FSLIB) test/diskinfo.o |
| 274 |
-- gcc test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g -o diskinfo |
| 275 |
-+ $(CC) test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g -o diskinfo |
| 276 |
- |
| 277 |
- .c.o: |
| 278 |
-- gcc $(FSLIB_CFLAGS) -c $< -o $@ |
| 279 |
-+ $(CC) $(FSLIB_CFLAGS) -c $< -o $@ |
| 280 |
- |
| 281 |
- clean: |
| 282 |
- rm -rf *~ *.o test/*.o $(OBJS) $(FSLIB) $(FSLIB_TOOLS) |
| 283 |
-diff --git a/kernel/Makefile b/kernel/Makefile |
| 284 |
-index 1a71617..4f9760d 100644 |
| 285 |
---- a/kernel/Makefile |
| 286 |
-+++ b/kernel/Makefile |
| 287 |
-@@ -3,6 +3,7 @@ OBJECTS = $(SOURCES:.cc=.o) |
| 288 |
- TARGET_DIR = ./build/ |
| 289 |
- TARGET = $(TARGET_DIR)/libbckernel.a |
| 290 |
- BC_CFLAGS = $(BC_EXTRA_CFLAGS) -fPIC -c -Wall -ludev -L../build/ -lspacemap -I../ -fvisibility=hidden #-fvisibility-inlines-hidden |
| 291 |
-+CXX = g++ |
| 292 |
- |
| 293 |
- |
| 294 |
- ### Build ### |
| 295 |
-@@ -21,12 +22,12 @@ module: create-dirs force_look |
| 296 |
- |
| 297 |
- kernel-lib: create-dirs $(TARGET) |
| 298 |
- $(TARGET): $(OBJECTS) |
| 299 |
-- ar rcs $(TARGET) $(OBJECTS) |
| 300 |
-+ $(AR) rcs $(TARGET) $(OBJECTS) |
| 301 |
- |
| 302 |
- $(OBJECTS): Makefile $(SOURCES) BCKernel.h |
| 303 |
- set -e; \ |
| 304 |
- for i in $(SOURCES); do \ |
| 305 |
-- g++ -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \ |
| 306 |
-+ $(CXX) -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \ |
| 307 |
- done |
| 308 |
- |
| 309 |
- create-dirs: $(TARGET_DIR) |
| 310 |
-diff --git a/keygens/kgghost/Makefile b/keygens/kgghost/Makefile |
| 311 |
-index 8f6cc59..fe59ac7 100644 |
| 312 |
---- a/keygens/kgghost/Makefile |
| 313 |
-+++ b/keygens/kgghost/Makefile |
| 314 |
-@@ -5,10 +5,13 @@ KGGHOST_OBJS = hash.o pbe.o keyblock.o datablock.o kgghost.o |
| 315 |
- KGGHOST_CFLAGS = -Wall -p -ggdb -I. -I../../ -I../../certificate -DBC_LINUX |
| 316 |
- KGGHOST_CFLAGS += $(BC_EXTRA_CFLAGS) |
| 317 |
- |
| 318 |
-+CXX = g++ |
| 319 |
-+AR = ar |
| 320 |
-+ |
| 321 |
- all: $(KGGHOST) Makefile |
| 322 |
- |
| 323 |
- $(KGGHOST):$(KGGHOST_OBJS) $(CERTIFICATE_LIB) |
| 324 |
-- ar rcs $(KGGHOST) $(KGGHOST_OBJS) |
| 325 |
-+ $(AR) rcs $(KGGHOST) $(KGGHOST_OBJS) |
| 326 |
- |
| 327 |
- $(CERTIFICATE_LIB): |
| 328 |
- make -C ../../certificate/CertificateLib |
| 329 |
-@@ -17,7 +20,7 @@ $(KERNEL_LIB): |
| 330 |
- make -C ../../kernel/build |
| 331 |
- |
| 332 |
- %.o:%.cpp |
| 333 |
-- g++ $(KGGHOST_CFLAGS) -c -o $@ $< |
| 334 |
-+ $(CXX) $(KGGHOST_CFLAGS) -c -o $@ $< |
| 335 |
- |
| 336 |
- clean: |
| 337 |
- rm -f *.o *.ver *~ $(KGGHOST) |
| 338 |
-diff --git a/keygens/kgsha/Makefile b/keygens/kgsha/Makefile |
| 339 |
-index f1a89f9..57f55ca 100644 |
| 340 |
---- a/keygens/kgsha/Makefile |
| 341 |
-+++ b/keygens/kgsha/Makefile |
| 342 |
-@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o |
| 343 |
- KGSHA_CFLAGS = -Wall -p -gdwarf-2 -I. -I../../ -I../../certificate -DBC_LINUX |
| 344 |
- KGSHA_CFLAGS += $(EXTRA_CFLAGS) |
| 345 |
- |
| 346 |
-+CXX = g++ |
| 347 |
-+AR = ar |
| 348 |
-+ |
| 349 |
- all: $(KGSHA) $(KGSHA_OBJS) Makefile hidden_sector.h defs.h datablock.h |
| 350 |
- |
| 351 |
- $(KGSHA): $(KGSHA_OBJS) $(CERTIFICATE_LIB) $(KERN_LIB) |
| 352 |
-- ar rcs $(KGSHA) $(KGSHA_OBJS) |
| 353 |
-+ $(AR) rcs $(KGSHA) $(KGSHA_OBJS) |
| 354 |
- |
| 355 |
- $(CERT_LIB): |
| 356 |
- make -C ../../certificate/CertificateLib |
| 357 |
-@@ -22,7 +25,7 @@ $(KERN_LIB): |
| 358 |
- make -C ../../kernel/ |
| 359 |
- |
| 360 |
- %.o:%.cpp |
| 361 |
-- g++ $(KGSHA_CFLAGS) -c -o $@ $< |
| 362 |
-+ $(CXX) $(KGSHA_CFLAGS) -c -o $@ $< |
| 363 |
- |
| 364 |
- clean: |
| 365 |
- rm -f *.o *.ver *~ $(KGSHA) |
| 366 |
-diff --git a/mount/Makefile b/mount/Makefile |
| 367 |
-index 7a3d66b..0e60095 100644 |
| 368 |
---- a/mount/Makefile |
| 369 |
-+++ b/mount/Makefile |
| 370 |
-@@ -1,22 +1,23 @@ |
| 371 |
- |
| 372 |
- HELPERS = bcrrpart_helper bcmount_helper bcumount_helper |
| 373 |
- |
| 374 |
-+CC = gcc |
| 375 |
- OBJS = common.o |
| 376 |
- CFLAGS += -Wall -O3 |
| 377 |
- |
| 378 |
- all: $(HELPERS) Makefile |
| 379 |
- |
| 380 |
- bcrrpart_helper: $(OBJS) rrpart.o |
| 381 |
-- gcc $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper |
| 382 |
-+ $(CC) $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper |
| 383 |
- |
| 384 |
- bcmount_helper: $(OBJS) mount.o |
| 385 |
-- gcc $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper |
| 386 |
-+ $(CC) $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper |
| 387 |
- |
| 388 |
- bcumount_helper: $(OBJS) umount.o |
| 389 |
-- gcc $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper |
| 390 |
-+ $(CC) $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper |
| 391 |
- |
| 392 |
- %.o:%.c |
| 393 |
-- gcc $(CFLAGS) -c -o $@ $< |
| 394 |
-+ $(CC) $(CFLAGS) -c -o $@ $< |
| 395 |
- |
| 396 |
- clean: |
| 397 |
- rm -f *.o *.ver *~ $(HELPERS) |
| 398 |
-diff --git a/spacemap/Makefile b/spacemap/Makefile |
| 399 |
-index 6dff240..7dd2ad9 100644 |
| 400 |
---- a/spacemap/Makefile |
| 401 |
-+++ b/spacemap/Makefile |
| 402 |
-@@ -5,17 +5,19 @@ LIB_NAME = spacemap |
| 403 |
- STATIC_TARGET = lib$(LIB_NAME).a |
| 404 |
- OBJECT_CFLAGS = -fPIC -g -c -Wall -ludev -fvisibility=hidden #-fvisibility-inlines-hidden |
| 405 |
- |
| 406 |
-+CXX = g++ |
| 407 |
-+AR = ar |
| 408 |
- |
| 409 |
- all: static |
| 410 |
- true |
| 411 |
- |
| 412 |
- static: $(OBJECTS) |
| 413 |
-- ar rcs $(STATIC_TARGET) $(OBJECTS) |
| 414 |
-+ $(AR) rcs $(STATIC_TARGET) $(OBJECTS) |
| 415 |
- |
| 416 |
- $(OBJECTS): $(SOURCES) |
| 417 |
- set -e; \ |
| 418 |
- for i in $(SOURCES); do \ |
| 419 |
-- g++ $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \ |
| 420 |
-+ $(CXX) $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \ |
| 421 |
- done |
| 422 |
- |
| 423 |
- clean: |
| 424 |
-diff --git a/tests/Makefile b/tests/Makefile |
| 425 |
-index c6d78f0..419020b 100644 |
| 426 |
---- a/tests/Makefile |
| 427 |
-+++ b/tests/Makefile |
| 428 |
-@@ -2,8 +2,8 @@ TESTS_PWD = ../build/tests/ |
| 429 |
- TESTS_TARGET = $(TESTS_PWD)/bctool-tests |
| 430 |
- TESTS_SOURCES = tests-main.c ../container/cipher.cc ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/linux/file.cpp |
| 431 |
- TESTS_CFLAGS = -I../ -I../certificate/ -L../build/ -L../build/kernel/ -DBC_LINUX -ludev -g |
| 432 |
--CP = gcc |
| 433 |
--CPP = g++ |
| 434 |
-+CC = gcc |
| 435 |
-+CXX = g++ |
| 436 |
- CERT_LIB_NAME = certificate |
| 437 |
- KERN_LIB_NAME = bckernel |
| 438 |
- SPACEMAP_LIB_NAME = spacemap |
| 439 |
-@@ -15,11 +15,11 @@ all: $(TESTS_TARGET) |
| 440 |
- cp insert-modules.sh remove-modules.sh bcmod-loaded.sh $(TESTS_PWD) |
| 441 |
- |
| 442 |
- $(TESTS_TARGET): $(TESTS_SOURCES) Makefile |
| 443 |
-- $(CPP) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev |
| 444 |
-+ $(CXX) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev |
| 445 |
- cp kernel/print-struct-size.c $(TESTS_PWD) |
| 446 |
-- $(CP) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) |
| 447 |
-- $(CPP) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) |
| 448 |
-- $(CP) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c |
| 449 |
-+ $(CC) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) |
| 450 |
-+ $(CXX) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) |
| 451 |
-+ $(CC) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c |
| 452 |
- |
| 453 |
- clean: |
| 454 |
- rm -rf $(TESTS_PWD) |
| 455 |
--- |
| 456 |
-2.0.5 |
| 457 |
- |
Archives