Skip to content

Use same %libdir% directory for avx2 builds, then move libs #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunnyflunk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use same %libdir% directory for avx2 builds, then move libs #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ypkg2/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ def execute_step(context, step, step_n, work_dir):
if context.avx2:
script.define_export("AVX2BUILD", "1")
extraScript = None
endScript = None

# Allow GCC and such to pick up on our timestamp
script.define_export("SOURCE_DATA_EPOCH",
Expand All @@ -137,6 +138,9 @@ def execute_step(context, step, step_n, work_dir):
script.define_export("LLVM_PROFILE_FILE", profileFile)
script.define_export("YPKG_PGO_DIR", context.get_pgo_dir())

if context.avx2 and step_n == "install":
endScript = "%avx2_lib_shift"

exports = script.emit_exports()

# Run via bash with enable and error
Expand All @@ -150,6 +154,8 @@ def execute_step(context, step, step_n, work_dir):
if extraScript:
full_text += "\n\n{}\n".format(extraScript)
full_text += "\n\n{}\n".format(step)
if endScript:
full_text += "\n\n{}\n".format(endScript)
output = script.escape_string(full_text)

with tempfile.NamedTemporaryFile(prefix="ypkg-%s" % step_n) as script_ex:
Expand Down
4 changes: 4 additions & 0 deletions ypkg2/rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ actions:
else
echo "\n\nError: Profiling requested by ypkg but doesn't exist\n\n"
fi
- avx2_lib_shift: |
install -dm00755 $PKG_BUILD_DIR/haswell
mv %installroot%/%libdir%/* $PKG_BUILD_DIR/haswell
mv $PKG_BUILD_DIR/haswell %installroot%/%libdir%/
defines:
- CONFOPTS: |
--prefix=%PREFIX% --build=%HOST% --libdir=%libdir% --mandir=/usr/share/man \
Expand Down
15 changes: 4 additions & 11 deletions ypkg2/scripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,13 @@ def load_system_macros(self):
def init_default_macros(self):

if self.context.emul32:
if self.context.avx2:
self.define_macro("libdir", "/usr/lib32/haswell")
else:
self.define_macro("libdir", "/usr/lib32")
self.define_macro("libdir", "/usr/lib32")
self.define_macro("LIBSUFFIX", "32")
self.define_macro("PREFIX", "/usr")
else:
# 64-bit AVX2 build in subdirectory
if self.context.avx2:
self.define_macro("libdir", "/usr/lib64/haswell")
else:
self.define_macro("libdir", "/usr/lib64")
self.define_macro("libdir", "/usr/lib64")
self.define_macro("LIBSUFFIX", "64")
self.define_macro("PREFIX", "/usr")

self.define_macro("PREFIX", "/usr")

self.define_macro("installroot", self.context.get_install_dir())
self.define_macro("workdir", self.work_dir)
Expand Down