-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Based on @nathanhjli's work in #100 Other changes: - Removing the CentOS 7 Clang 7 build and compiler flags for Clang 7. - Simplifying instantiation of Dependency objects by module name in builder.py for modules in build_definitions that only have one Dependency subclass. - Enable compiler wrapper as needed for each dependency.
- Loading branch information
Showing
14 changed files
with
216 additions
and
286 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git src/tests/asn.1/Makefile.in src/tests/asn.1/Makefile.in | ||
index eabe0bd..b0a3b74 100644 | ||
--- src/tests/asn.1/Makefile.in | ||
+++ src/tests/asn.1/Makefile.in | ||
@@ -29,7 +29,7 @@ krb5_decode_leak: $(LEAKOBJS) $(KRB5_BASE_DEPLIBS) | ||
$(CC_LINK) -o krb5_decode_leak $(LEAKOBJS) $(KRB5_BASE_LIBS) | ||
|
||
t_trval: t_trval.o | ||
- $(CC) -o t_trval $(ALL_CFLAGS) t_trval.o | ||
+ $(CC) -o t_trval $(ALL_CFLAGS) $(LDFLAGS) t_trval.o | ||
|
||
check: check-encode check-encode-trval check-decode check-leak | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
# | ||
# Copyright (c) YugaByte, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
# in compliance with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software distributed under the License | ||
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
# or implied. See the License for the specific language governing permissions and limitations | ||
# under the License. | ||
# | ||
|
||
import os | ||
import sys | ||
|
||
from yugabyte_db_thirdparty.build_definition_helpers import * # noqa | ||
|
||
|
||
class Krb5Dependency(Dependency): | ||
def __init__(self) -> None: | ||
super(Krb5Dependency, self).__init__( | ||
'krb5', | ||
'1.19.3', | ||
'https://kerberos.org/dist/krb5/1.19/krb5-{0}.tar.gz', | ||
BUILD_GROUP_INSTRUMENTED) | ||
self.copy_sources = True | ||
self.patches = ['krb5-1.19.3-use-ldflags-for-test.patch'] | ||
self.patch_strip = 0 | ||
|
||
def get_additional_ld_flags(self, builder: BuilderInterface) -> List[str]: | ||
flags: List[str] = super().get_additional_ld_flags(builder) | ||
if builder.compiler_choice.is_linux_clang1x(): | ||
if builder.build_type == BUILD_TYPE_ASAN: | ||
# Needed to find dlsym. | ||
flags.append('-ldl') | ||
return flags | ||
|
||
def get_compiler_wrapper_ld_flags_to_remove(self, builder: BuilderInterface) -> Set[str]: | ||
return {'-Wl,--no-undefined'} | ||
|
||
def build(self, builder: BuilderInterface) -> None: | ||
extra_args = [ | ||
'--disable-nls', # Remove the dependency on gettext. | ||
] | ||
if builder.build_type in [BUILD_TYPE_ASAN]: | ||
extra_args.append('--enable-asan') | ||
builder.build_with_configure( | ||
log_prefix=builder.log_prefix(self), | ||
src_subdir_name='src', | ||
extra_args=extra_args, | ||
) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.